Mercurial > evolve
comparison tests/test-split.t @ 1484:e3484e9632cd
split: don't update before it is actually needed
Before this patch, we were updating the working copy parent needlessly and
before the error checking. This patch fixes the issue.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Sat, 08 Aug 2015 12:45:36 -0700 |
parents | dc1467a629ca |
children | 1ba64be11bf8 |
comparison
equal
deleted
inserted
replaced
1483:dc1467a629ca | 1484:e3484e9632cd |
---|---|
170 > y | 170 > y |
171 > y | 171 > y |
172 > n | 172 > n |
173 > y | 173 > y |
174 > EOF | 174 > EOF |
175 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 175 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
176 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
177 reverting _b | 176 reverting _b |
178 adding _c | 177 adding _c |
179 diff --git a/_b b/_b | 178 diff --git a/_b b/_b |
180 1 hunks, 1 lines changed | 179 1 hunks, 1 lines changed |
181 examine changes to '_b'? [Ynesfdaq?] y | 180 examine changes to '_b'? [Ynesfdaq?] y |
257 > [experimental] | 256 > [experimental] |
258 > evolution=createmarkers | 257 > evolution=createmarkers |
259 > evolutioncommands=split | 258 > evolutioncommands=split |
260 > EOF | 259 > EOF |
261 $ hg split -r "desc(split3)" | 260 $ hg split -r "desc(split3)" |
262 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
263 abort: cannot split commit: ced8fbcce3a7 not a head | 261 abort: cannot split commit: ced8fbcce3a7 not a head |
264 [255] | 262 [255] |
265 | 263 |
266 | 264 |