Matt Mackall
|
8d82cba09a
|
merge: introduce mergestate
|
2008-04-10 15:02:24 -05:00 |
|
Dirkjan Ochtman
|
3e3b0d62eb
|
warn about new heads on commit (issue842)
|
2008-03-21 11:06:02 +01:00 |
|
Matt Mackall
|
06d5fbf2a5
|
copy: handle rename internally
- add rename parameter
- don't collect copied list
- report "moving" rather than "copying"
- remove renamed files
- don't return copied list
- simplify callers
|
2007-12-07 02:29:55 -06:00 |
|
Matt Mackall
|
d00f8a1d6c
|
merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
|
2007-07-05 16:01:07 -05:00 |
|