view tests/test-convert-clonebranches.out @ 10930:230ab9a23594

wix updates - using FileSource attribute - removed unneeded "DiskId='1'" - all guids are now in guids.wxi
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 16 Apr 2010 14:57:30 +0200
parents d1b135f2f415
children
line wrap: on
line source

marked working directory as branch branch0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% convert
3 adda
2 changea
1 addb
pulling from default into branch0
1 changesets found
0 mergeab
pulling from default into branch0
1 changesets found
marked working directory as branch branch1
marked working directory as branch branch2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
marked working directory as branch branch3
% incremental conversion
2 c1
pulling from branch0 into branch1
4 changesets found
1 c2
pulling from branch0 into branch2
4 changesets found
0 c3
pulling from branch2 into branch3
5 changesets found
pulling from branch1 into branch3
1 changesets found