view tests/test-rebase-scenario-global.out @ 10397:8cb81d75730c

mq: add parent node IDs to MQ patches on qrefresh/qnew

The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.

This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:

    * Resolve conflicts found when qpushing to a new location by merging
      instead of simply showing rejects.

    * Display better diffs of versioned MQ patches because we can tell how the
      patched files have changed in the meantime.

Here are the new rules this patch introduces.  They are checked in this order:

    * If a patch currently has old, plain-style patch headers ("From:" and
      "Date:") do not change the style or add any new headers.

    * If the 'mq.plain' configuration setting is true, only plain-style
      headers will be used for all MQ patches.

    * qnew will initialize new patches with HG-style headers and fill in the
      "# Parent" header with the appropriate parent node.

    * qrefresh will refresh the "# Parent" header with the current parent of
      the current patch.

@  5: F
|
| o  4: E
|/|
o |  3: D
| |
| o  2: C
|/
| o  1: B
|/
o  0: A

% Rebasing
% B onto F - simple rebase
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 5 changesets with 4 changes to 4 files (+1 heads)
rebase completed
@  5: B
|
o  4: F
|
| o  3: E
|/|
o |  2: D
| |
| o  1: C
|/
o  0: A

% B onto D - intermediate point
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 5 changesets with 4 changes to 4 files (+2 heads)
rebase completed
@  5: B
|
| o  4: F
|/
| o  3: E
|/|
o |  2: D
| |
| o  1: C
|/
o  0: A

% C onto F - skip of E
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
rebase completed
@  4: C
|
o  3: F
|
o  2: D
|
| o  1: B
|/
o  0: A

% D onto C - rebase of a branching point (skip E)
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  4: F
|
o  3: D
|
o  2: C
|
| o  1: B
|/
o  0: A

% E onto F - merged revision having a parent in ancestors of target
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (-1 heads)
rebase completed
@    5: E
|\
| o  4: F
| |
| o  3: D
| |
o |  2: C
|/
| o  1: B
|/
o  0: A

% D onto B - E maintains C as parent
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
rebase completed
@  5: F
|
| o  4: E
|/|
o |  3: D
| |
| o  2: C
| |
o |  1: B
|/
o  0: A

% These will fail (using --source)
% E onto D - rebase onto an ancestor
abort: source is descendant of destination
% D onto E - rebase onto a descendant
abort: source is ancestor of destination
% E onto B - merge revision with both parents not in ancestors of target
abort: cannot use revision 4 as base, result would have 3 parents

% These will abort gracefully (using --base)
% E onto E - rebase onto same changeset
nothing to rebase
% E onto D - rebase onto an ancestor
nothing to rebase
% D onto E - rebase onto a descendant
nothing to rebase