Show More
@@ -113,3 +113,53 b'' | |||
|
113 | 113 | created new head |
|
114 | 114 | $ hg debugrename b/c |
|
115 | 115 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
|
116 | ||
|
117 | ||
|
118 | Second scenario with two repos: | |
|
119 | ||
|
120 | $ cd .. | |
|
121 | $ mkdir r1 | |
|
122 | $ cd r1 | |
|
123 | $ hg init | |
|
124 | $ mkdir a | |
|
125 | $ echo foo > a/f | |
|
126 | $ hg add a | |
|
127 | adding a/f | |
|
128 | $ hg ci -m "a/f == foo" | |
|
129 | $ cd .. | |
|
130 | ||
|
131 | $ hg clone r1 r2 | |
|
132 | updating to branch default | |
|
133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
134 | $ cd r2 | |
|
135 | $ hg mv a b | |
|
136 | moving a/f to b/f | |
|
137 | $ echo foo1 > b/f | |
|
138 | $ hg ci -m" a -> b, b/f == foo1" | |
|
139 | $ cd .. | |
|
140 | ||
|
141 | $ cd r1 | |
|
142 | $ mkdir a/aa | |
|
143 | $ echo bar > a/aa/g | |
|
144 | $ hg add a/aa | |
|
145 | adding a/aa/g | |
|
146 | $ hg ci -m "a/aa/g" | |
|
147 | $ hg pull ../r2 | |
|
148 | pulling from ../r2 | |
|
149 | searching for changes | |
|
150 | adding changesets | |
|
151 | adding manifests | |
|
152 | adding file changes | |
|
153 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
154 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
|
155 | ||
|
156 | $ hg merge | |
|
157 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
158 | (branch merge, don't forget to commit) | |
|
159 | ||
|
160 | $ hg st -C | |
|
161 | M b/f | |
|
162 | A b/aa/g | |
|
163 | a/aa/g | |
|
164 | R a/aa/g | |
|
165 | R a/f |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now