Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue612.out
author Matt Mackall <mpm@selenic.com>
Fri, 07 Dec 2007 02:29:55 -0600
changeset 5610 2493a478f395
parent 4819 9797124581c9
child 6336 4b0c9c674707
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
mercurial