4 Commits

Author	SHA1	Message	Date
Matt Mackall	8e8234eecc	dirstate: merge falls through to otherparent ... This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.	2014-10-11 14:05:09 -05:00
Matt Mackall	f7a8e82c62	dirstate: use 'm' state in otherparent to reduce ambiguity ... In rebase-like operations where we abandon the second parent, we can correctly fix up the state in setparents.	2014-10-10 13:31:06 -05:00
Mads Kiilerich	4aef593d5a	merge: don't overwrite file untracked after remove, abort with 'untracked files' ... Merge could overwrite untracked files and cause data loss. Instead we now handle the 'local side removed file and has untracked file instead' case as the 'other side added file that local has untracked' case: FILE: untracked file exists abort: untracked files in working directory differ from files in requested revision It could perhaps make sense to create .orig files when overwriting, either instead of aborting or when overwriting anyway because of force ... but for now we stay consistent with similar cases.	2014-02-10 00:43:54 +01:00
Adrian Buehlmann	b48212d057	tests: unify test-merge-remove	2010-09-12 12:11:39 +02:00