Mercurial > hg
view tests/test-merge-remove.out @ 6523:98dfc5751fdc
test-imerge: disable due to massive brokenness
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 11 Apr 2008 22:17:20 -0700 |
parents | 368a4ec603cc |
children | 9eb274d773d9 |
line wrap: on
line source
created new head merging foo1 and foo to foo1 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 % removing foo1 and bar r 0 -2 bar r 0 -1 foo1 copy: foo -> foo1 R bar R foo1 foo % readding foo1 and bar adding bar adding foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo % reverting foo1 and bar warning: working directory has two parents, tag '.' uses the first saving current version of bar as bar.orig reverting bar saving current version of foo1 as foo1.orig reverting foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo