Mercurial > hg
view tests/test-branches.out @ 6109:242595e612ed
revert: unify forget and remove lists
This doesn't make a difference right now, but after the next revision
some files in state 'a' may end up in the deleted list, and revert
won't be able to just remove all files in that list.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 14 Feb 2008 18:08:16 -0200 |
parents | 57c1a7052982 |
children | 4b0c9c674707 |
line wrap: on
line source
marked working directory as branch a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch c c 5:5ca481e59b8c a 1:dd6b440dd85a b 4:22df7444f7c1 (inactive) default 0:19709c5a4e75 (inactive) ------- c 5:5ca481e59b8c a 1:dd6b440dd85a --- Branch a changeset: 1:dd6b440dd85a branch: a user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: Adding a branch ---- Branch b changeset: 4:22df7444f7c1 branch: b parent: 2:ac22033332d1 user: test date: Thu Jan 01 00:00:04 1970 +0000 summary: Adding b branch head 2 changeset: 3:aee39cd168d0 branch: b user: test date: Thu Jan 01 00:00:03 1970 +0000 summary: Adding b branch head 1 changeset: 2:ac22033332d1 branch: b parent: 0:19709c5a4e75 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: Adding b branch