view tests/test-revert.out @ 9815:49efeed49c94

rebase: make sure the newancestor is used during the whole update
(issue1561)

Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).

Added a new test case for this: test-rebase-newancestor.

Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.

%% should show b unknown
? b
%% should show b unknown and c modified
M c
? b
%% should show b added and c modified
M c
A b
%% should show a removed, b added and c modified
M c
A b
R a
%% should show b added, copy saved, and c modified
M c
A b
%% should show b unknown, and c modified
M c
? b
%% should show unknown: b
? b
%% should show b added
A b
%% should show b deleted
! b
forgetting b
%% should not find b
b: No such file or directory
%% should show a c e
a
c
e
%% should verbosely save backup to e.orig
saving current version of e as e.orig
reverting e
%% should say no changes needed
no changes needed to a
%% should say file not managed
file not managed: q
%% should say file not found
notfound: No such file in rev 095eacd0c0d7
A z
? e.orig
%% should add a, remove d, forget z
adding a
removing d
forgetting z
%% should forget a, undelete d
forgetting a
undeleting d
%% should silently add a
A a
R d
%% should silently keep d removed
R d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
reverting c
%% should print non-executable
non-executable
reverting c
%% should print executable
executable
%% issue 241
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail - no arguments
abort: no files or directories specified; use --all to revert the whole repo
% should succeed
reverting a
%% issue332
adding b/b
created new head
reverting b/b
forgetting newdir/newfile
reverting b/b
% reverting a rename target should revert the source
? newa
%% 4 ignored files (we will add/commit everything)
I ignored
I ignoreddir/file
I ignoreddir/removed
I removed
%% should revert ignored* and undelete *removed
reverting ignored
reverting ignoreddir/file
undeleting ignoreddir/removed
undeleting removed
%% should silently revert the named files