2007-02-28 01:20:06 +03:00
|
|
|
adding a/f
|
2008-03-21 16:52:24 +03:00
|
|
|
updating working directory
|
2007-02-28 01:20:06 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2007-12-07 11:29:55 +03:00
|
|
|
moving a/f to b/f
|
2007-02-28 01:20:06 +03:00
|
|
|
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)
|
2007-05-08 11:59:13 +04:00
|
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2007-02-28 01:20:06 +03:00
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
M b/f
|
|
|
|
A b/aa/g
|
|
|
|
a/aa/g
|
|
|
|
R a/aa/g
|
|
|
|
R a/f
|