Matt Mackall
e3a172f2f0
merge: don't use unknown()
...
This removes use of unknown files for building the synthetic working
directory manifest used by manifestmerge. Instead, we adopt the
strategy used by _checkunknown.
Side-effect: unknown files are no longer moved by remote directory
renames, and now are left alone like ignored files.
2012-02-09 17:04:17 -06:00
Alain Leufroy
eddef4ddbd
graft: add test to check the phase of new changesets
...
Graft actually do not keep the phase of the source
changesets: no need to change the graft code and add
test to check this behaviour.
2012-01-17 11:08:23 +01:00
Pierre-Yves David
1b001a85f3
changeset_printer: display changeset phase on debug level
...
Backward compatibility make it hard to display it on higher level
2012-01-17 20:23:23 +01:00
Matt Mackall
dea868ff61
cmdutil: simplify duplicatecopies
2012-01-05 20:35:10 -06:00
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
Matt Mackall
75db0d196a
merge with stable
2011-11-17 16:53:17 -06:00
Stefano Tortarolo
f195f71994
graft: disallow grafting grafted csets in specific situations (issue3091)
...
In particular, we do not allow:
- grafting an already grafted cset onto its original branch
- grafting already grafted csets with the same origin onto each other
2011-11-12 14:00:25 +01:00
Stefano Tortarolo
2dbc061389
graft: use revs to make tests more readable
2011-11-12 11:23:52 +01:00
Stefano Tortarolo
dfee711e26
graft: preserve original source in subsequent grafts
2011-11-12 13:15:40 +01:00
Matt Mackall
66de5cde16
merge: give a special message for internal:merge failure (issue3105)
2011-11-16 18:04:19 -06:00
Matt Mackall
3c5a04f076
graft: add a test
2011-10-24 17:01:49 -05:00
