tests/test-update-reverse.out
author Alexander Solovyov <piranha@piranha.org.ua>
Thu, 25 Dec 2008 10:48:24 +0200
changeset 7547 4949729ee9ee
parent 6805 482581431dcd
child 8734 60fa3371aa75
permissions -rw-r--r--
python implementation of diffstat Implemented as two functions: diffstat, which yields lines of text, formatted as a usual diffstat output, and diffstatdata, which is called inside diffstat to do real performing and yield file names with appropriate data (numbers of added and removed lines).

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Main should be gone
a
created new head
changeset:   3:ded32b0db104
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added side2

changeset:   2:92a816cea698
parent:      0:537353581d3d
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added side1

changeset:   1:221226fb2bd8
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added main

changeset:   0:537353581d3d
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added a

Should have two heads, side2 and main
changeset:   3:ded32b0db104
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added side2

changeset:   1:221226fb2bd8
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     Added main

Should show a side1 side2
a
side1
side2
resolving manifests
 overwrite True partial False
 ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8
 side2: remote deleted -> r
 side1: remote deleted -> r
 main: remote created -> g
removing side1
removing side2
getting main
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Should only show a main
a
main