Mercurial > hg
comparison tests/test-rename-merge1.t @ 13492:ca940d06bf95 stable
tests: test renaming a file added on two branches (issue2089)
The issue was fixed by d100702326d5 .
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Thu, 24 Feb 2011 13:57:52 -0300 |
parents | d100702326d5 |
children | 37f487b9fbcc |
comparison
equal
deleted
inserted
replaced
13491:9c5aae633d5f | 13492:ca940d06bf95 |
---|---|
123 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 123 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
124 (branch merge, don't forget to commit) | 124 (branch merge, don't forget to commit) |
125 | 125 |
126 $ cat f2 | 126 $ cat f2 |
127 c0 | 127 c0 |
128 | |
129 Check for issue2089 | |
130 | |
131 $ hg init repo2089 | |
132 $ cd repo2089 | |
133 | |
134 $ echo 0 > A | |
135 $ hg -q ci -Am 0 | |
136 | |
137 $ hg -q up -C null | |
138 $ echo 1 > A | |
139 $ hg -q ci -Am 1 | |
140 | |
141 $ hg -q up -C 0 | |
142 $ hg merge 1 -q --tool internal:local | |
143 $ echo 2 > A | |
144 $ hg -q ci -m 2 | |
145 | |
146 $ hg -q up -C 1 | |
147 $ hg mv A a | |
148 $ hg -q ci -Am 3 | |
149 | |
150 $ hg -q up -C 2 | |
151 $ hg merge 3 | |
152 merging A and a to a | |
153 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
154 (branch merge, don't forget to commit) | |
155 | |
156 $ cat a | |
157 2 |