Bazaar

Merge lp://staging/~nmb/bzr/fix-505093 into lp://staging/bzr

  1. fix-505093
  2. Merge into bzr.dev
Proposed by Neil Martinsen-Burrell
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~nmb/bzr/fix-505093
Merge into: lp://staging/bzr
Diff against target: 54 lines (+18/-14)
2 files modified
NEWS (+3/-0)
bzrlib/builtins.py (+15/-14)
To merge this branch: bzr merge lp://staging/~nmb/bzr/fix-505093
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+17568@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

This is an attempt to improve the text in revert's documentation to address Eli's concerns.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Sounds good to me, I'll merge as soon as we get a second review or in 24 hours, whatever comes first.

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Neil Martinsen-Burrell wrote:
> Neil Martinsen-Burrell has proposed merging lp:~nmb/bzr/fix-505093 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #505093 [doc] inadequate documentation of "revert --forget-merges"
> https://bugs.launchpad.net/bugs/505093
>
>
> This is an attempt to improve the text in revert's documentation to address Eli's concerns.
>

 merge:approve

Since Vincent isn't on vacation today, I'll let him merge this.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktUd4oACgkQJdeBCYSNAAPRnACfZsb6MQAMnfRegns4Fbj/1Wlb
AS8An3qAOGEmN5siFIsD/lFfY1BswaMk
=RCk2
-----END PGP SIGNATURE-----

Revision history for this message
Vincent Ladeuil (vila) wrote :

> Since Vincent isn't on vacation today,

... and patch pilot :-)

pqm'ed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-01-17 20:06:41 +0000
3+++ NEWS 2010-01-18 02:46:20 +0000
4@@ -111,6 +111,9 @@
5 should appear up-to-date.)
6 (John Arbash Meinel, Martin <gzlist>, #488724)
7
8+* Improve discussion of pending merges in the documentation for
9+ ``revert``. (Neil Martinsen-Burrell, #505093)
10+
11 Improvements
12 ************
13
14
15=== modified file 'bzrlib/builtins.py'
16--- bzrlib/builtins.py 2010-01-15 04:05:36 +0000
17+++ bzrlib/builtins.py 2010-01-18 02:46:20 +0000
18@@ -4083,22 +4083,23 @@
19 created as above. Directories containing unknown files will not be
20 deleted.
21
22- The working tree contains a list of pending merged revisions, which will
23- be included as parents in the next commit. Normally, revert clears that
24- list as well as reverting the files. If any files are specified, revert
25- leaves the pending merge list alone and reverts only the files. Use "bzr
26- revert ." in the tree root to revert all files but keep the merge record,
27- and "bzr revert --forget-merges" to clear the pending merge list without
28+ The working tree contains a list of revisions that have been merged but
29+ not yet committed. These revisions will be included as additional parents
30+ of the next commit. Normally, using revert clears that list as well as
31+ reverting the files. If any files are specified, revert leaves the list
32+ of uncommitted merges alone and reverts only the files. Use ``bzr revert
33+ .`` in the tree root to revert all files but keep the recorded merges,
34+ and ``bzr revert --forget-merges`` to clear the pending merge list without
35 reverting any files.
36
37- Using "bzr revert --forget-merges", it is possible to apply the changes
38- from an arbitrary merge as a single revision. To do this, perform the
39- merge as desired. Then doing revert with the "--forget-merges" option will
40- keep the content of the tree as it was, but it will clear the list of
41- pending merges. The next commit will then contain all of the changes that
42- would have been in the merge, but without any mention of the other parent
43- revisions. Because this technique forgets where these changes originated,
44- it may cause additional conflicts on later merges involving the source and
45+ Using "bzr revert --forget-merges", it is possible to apply all of the
46+ changes from a branch in a single revision. To do this, perform the merge
47+ as desired. Then doing revert with the "--forget-merges" option will keep
48+ the content of the tree as it was, but it will clear the list of pending
49+ merges. The next commit will then contain all of the changes that are
50+ present in the other branch, but without any other parent revisions.
51+ Because this technique forgets where these changes originated, it may
52+ cause additional conflicts on later merges involving the same source and
53 target branches.
54 """
55