| author | Walter Doerwald <walter@livinglogic.de> |
| Tue, 28 Aug 2007 18:00:07 +0200 | |
| changeset 6140 | 47e6d5d5913a |
| parent 5610 | 2493a478f395 |
| child 6336 | 4b0c9c674707 |
| permissions | -rw-r--r-- |
|
4819
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
adding src/a.c |
|
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
4819
diff
changeset
|
2 |
moving src/a.c to source/a.c |
|
4819
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 |
? src/a.o |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 |
merging src/a.c and source/a.c |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 |
1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
(branch merge, don't forget to commit) |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
M source/a.c |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
R src/a.c |
|
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
? source/a.o |