Commit Graph

8 Commits

Author SHA1 Message Date
Martin Geisler
ae8ca6aff5 merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.
2011-12-09 17:34:53 +01:00
Sune Foldager
c8ff620c56 tests: fix deprecated use of hg debugdata/debugindex
For filelogs, debugindex and debugdata can be called with the file name
directly instead of the path to the revlog. Since in the future filelogs
will no longer be valid revlogs, calling with a path to the revlog is
deprecated for debugdata. For debugindex it is expected to still work,
but I changed them as well for consistency.
2011-05-04 13:37:41 +02:00
Patrick Mezard
b5d4dfb6b1 test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
2011-03-06 10:06:09 +01:00
Wagner Bruna
cf857d2ef8 tests: test renaming a file added on two branches (issue2089)
The issue was fixed by 5455f79e4f3b .
2011-02-24 13:57:52 -03:00
Matt Mackall
7bcb1a26b9 context: generate file ancestors in reverse revision order (issue2642)
The related() function in copies assumes that revisions are generated
in reverse revision order, so it was getting confused in some situations.
2011-02-23 17:27:05 -06:00
Dan Villiom Podlaski Christiansen
17cfc8fdc9 merge: make 'diverging renames' diagnostic a more helpful note.
See the Hg Book on why we actually want to detect this case:
http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290

Before:

$ hg up deadbeef
warning: detected divergent renames of X to:
...

After:

$ hg up deadbeef
note: possible conflict - X was renamed multiple times to:
...

No functionality change.
2010-10-10 09:50:25 -05:00
Dan Villiom Podlaski Christiansen
cff327a7f7 copies: don't detect copies as "divergent renames"
(For the purposes of this patch copy is defined as a rename where the
source continues to exist.)
2010-10-10 09:48:37 -05:00
Adrian Buehlmann
e5136472fc tests: unify test-rename-merge1 2010-09-14 13:43:05 +02:00