##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r8165:78658990 default
Show More
test-confused-revert.out
29 lines | 715 B | text/plain | TextLexer
/ tests / test-confused-revert.out
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 %%% should show a removed and b added
A b
R a
reverting...
Vadim Gelfer
small changes to revert command....
 r2042 undeleting a
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 forgetting b
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 %%% should show b unknown and a back to normal
? b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 merging a
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 %%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
Vadim Gelfer
make test-confused-revert check working dir with two parents.
 r2214 %%% revert should fail
Brendan Cully
cat: default to working dir parent instead of tip...
 r3095 abort: uncommitted merge - please provide a specific revision
Vadim Gelfer
make test-confused-revert check working dir with two parents.
 r2214 %%% revert should be ok now
Vadim Gelfer
small changes to revert command....
 r2042 undeleting a
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
 r2029 forgetting b
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 %%% should show b unknown and a marked modified (merged)
Alexis S. L. Carvalho
normallookup: during merges, restore the state saved by remove
 r6298 M a
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 ? b
%%% should show foo-b
foo-b