Mercurial > hg
view tests/test-rename-dir-merge2.out @ 10956:a156ce543a5b
bookmarks: complete the missing references from dda4ad7c9ea9 (issue2121)
The fix for issue1611 left one last use of "repo" instead of "self" that has
resulted in more memory leaks from push/pull operations.
| author | Isaac Jurado <diptongo@gmail.com> |
|---|---|
| date | Sat, 17 Apr 2010 14:32:26 +0200 |
| parents | a3d73b3e1f8a |
| children |
line wrap: on
line source
adding a/f updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved moving a/f to b/f adding a/aa/g pulling from ../r2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) M b/f A b/aa/g a/aa/g R a/aa/g R a/f