[Pkg-bazaar-commits] ./bzr/unstable r852: todo
Martin Pool
mbp at sourcefrog.net
Fri Apr 10 08:21:15 UTC 2009
------------------------------------------------------------
revno: 852
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-07-07 20:13:43 +1000
message:
todo
modified:
TODO
------------------------------------------------------------
revno: 0.1.1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 12:18:05 +1000
message:
Check in old existing knit code.
added:
knit.py
woolyweave.py
------------------------------------------------------------
revno: 0.1.2
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 12:38:05 +1000
message:
Import testsweet module adapted from bzr.
Start new test-driven development pattern, with a very trivial
test that stores and retrieves a single text.
added:
.bzrignore
testknit.py
testsweet.py
modified:
knit.py
------------------------------------------------------------
revno: 0.1.3
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 12:40:50 +1000
message:
Change storage of texts for testing
modified:
testknit.py
------------------------------------------------------------
revno: 0.1.4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 12:47:42 +1000
message:
Start indexing knits by both integer and version string.
Use index when inserting and checking text.
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:03:00 +1000
message:
Add test for storing two text versions.
Store texts as (index, line) pairs, where versions include only a
single index. Filter out active lines from get method.
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.6
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:03:44 +1000
message:
- remove dead code
modified:
knit.py
------------------------------------------------------------
revno: 0.1.7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:07:11 +1000
message:
Add trivial annotate text
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:07:53 +1000
message:
Unify get/annotate code
modified:
knit.py
------------------------------------------------------------
revno: 0.1.9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:08:42 +1000
message:
Remove dead test code
modified:
knit.py
------------------------------------------------------------
revno: 0.1.10
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:14:10 +1000
message:
Log messages when test is starting and finishing
modified:
testsweet.py
------------------------------------------------------------
revno: 0.1.11
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:14:22 +1000
message:
Add Knit.dump method
modified:
knit.py
------------------------------------------------------------
revno: 0.1.12
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:19:33 +1000
message:
Add stubbed-out TestSkipped
modified:
testsweet.py
------------------------------------------------------------
revno: 0.1.13
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:31:58 +1000
message:
Knit structure now allows for versions to include the lines present in other
versions. (Not applied transitively for the moment.) This is applied when
unpacking texts.
Start adding Knit.check()
Hand-pack a knit and check that included versions are respected when
unpacking lines.
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.14
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:34:57 +1000
message:
Another test for version inclusion
modified:
testknit.py
------------------------------------------------------------
revno: 0.1.15
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:36:20 +1000
message:
Fix inverted shell return code for testknit
modified:
testknit.py
------------------------------------------------------------
revno: 0.1.16
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 13:37:26 +1000
message:
formatting
modified:
knit.py
------------------------------------------------------------
revno: 0.1.17
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 14:12:24 +1000
message:
Use objects rather than tuples for tracking VerInfo for
better readability
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.18
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 14:17:51 +1000
message:
Better Knit.dump method
Add VerInfo.__repr__
modified:
knit.py
------------------------------------------------------------
revno: 0.1.19
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 14:18:10 +1000
message:
remove a reference to bzr from testsweet
modified:
testsweet.py
------------------------------------------------------------
revno: 0.1.20
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 14:21:55 +1000
message:
Factor out Knit.extract() method
modified:
knit.py
------------------------------------------------------------
revno: 0.1.21
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 14:26:07 +1000
message:
Start computing a delta to insert a new revision
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.22
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 17:43:45 +1000
message:
Calculate delta for new versions relative to a set of parent versions.
Simple test for delta calculation.
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.23
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 17:44:40 +1000
message:
tidy up
modified:
knit.py
------------------------------------------------------------
revno: 0.1.24
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 17:47:39 +1000
message:
Add another change for delta of new version.
modified:
testknit.py
------------------------------------------------------------
revno: 0.1.25
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:02:41 +1000
message:
Handle insertion of new weave layers that insert text on top of the basis
versions.
Knit.add takes a list of basis versions.
Turn on test for this.
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.26
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:05:56 +1000
message:
Refactor parameters to add command
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.27
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:10:16 +1000
message:
Check that version numbers passed in are reasonable
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.28
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:18:07 +1000
message:
More tests for insertion of lines in new versions.
modified:
testknit.py
------------------------------------------------------------
revno: 0.1.29
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:22:54 +1000
message:
Better internal error
modified:
knit.py
------------------------------------------------------------
revno: 0.1.30
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:23:09 +1000
message:
Start adding tests for line deletion
modified:
testknit.py
------------------------------------------------------------
revno: 0.1.31
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:27:15 +1000
message:
Fix insertion of multiple regions, calculating the right line offset as we go.
Add test for this.
modified:
knit.py
testknit.py
------------------------------------------------------------
revno: 0.1.32
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:33:27 +1000
message:
Clean up code to insert into weave
modified:
knit.py
------------------------------------------------------------
revno: 0.1.33
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:33:51 +1000
message:
add gpl text
modified:
knit.py
------------------------------------------------------------
revno: 0.1.34
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:34:36 +1000
message:
remove dead code
modified:
knit.py
------------------------------------------------------------
revno: 0.1.35
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-27 18:36:23 +1000
message:
Clean up Knit._delta method
modified:
knit.py
------------------------------------------------------------
revno: 0.1.36
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 16:00:26 +1000
message:
doc
modified:
knit.py
------------------------------------------------------------
revno: 0.1.37
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 16:00:51 +1000
message:
remove old dead code
removed:
woolyweave.py
------------------------------------------------------------
revno: 0.1.38
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 16:08:12 +1000
message:
Rename knit to weave. (I don't think there's an existing module called weave.)
renamed:
knit.py => weave.py
testknit.py => testweave.py
modified:
weave.py
testweave.py
------------------------------------------------------------
revno: 0.1.39
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 16:50:35 +1000
message:
Change to a more realistic weave structure which can represent insertions and
deletions.
Tests which calculate deltas are currently not working and are skipped.
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.40
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 16:58:34 +1000
message:
Add test for extracting from weave with nested insertions
Fix nested insertion processing
Check that stack is emptied at end of weave
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.41
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 17:04:05 +1000
message:
Doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.42
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 17:04:15 +1000
message:
More tests for nested insert instructions
modified:
testweave.py
------------------------------------------------------------
revno: 0.1.43
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 17:07:29 +1000
message:
More assertions on weave extraction
modified:
weave.py
------------------------------------------------------------
revno: 0.1.44
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 17:08:58 +1000
message:
More tests for nested insert instructions
modified:
testweave.py
------------------------------------------------------------
revno: 0.1.45
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 18:57:48 +1000
message:
doc
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.46
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 19:03:46 +1000
message:
More constraints on structure of weave, and checks that they work
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.47
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 19:08:12 +1000
message:
New WeaveError and WeaveFormatError rather than assertions.
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.48
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 19:21:30 +1000
message:
Basic parsing of delete instructions.
Check that they don't interfere with extracting revisions composed only of
insertions.
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 19:27:28 +1000
message:
Add another constraint: revisions should not delete text that they
just inserted
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.50
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 19:32:03 +1000
message:
Basic implementation of deletion markers
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.51
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 19:34:03 +1000
message:
Add test for replacement lines
modified:
testweave.py
------------------------------------------------------------
revno: 0.1.52
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 22:43:44 +1000
message:
Update tests for new weave representation
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.53
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 23:15:00 +1000
message:
doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.54
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 23:31:41 +1000
message:
Fix weave line calculation when making deltas
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.55
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 23:38:55 +1000
message:
doc
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.56
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-28 23:55:37 +1000
message:
Handle deletion of lines by marking the region with a deletion
Test deletions
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.57
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:10:14 +1000
message:
Fix bug in an update edit that both deletes and inserts -- previously
the insert was clobbered by our own delete.
Add some tests that do such updates.
Clean up imports of pformat.
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.58
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:16:10 +1000
message:
doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.59
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:16:17 +1000
message:
More modification tests
modified:
testweave.py
------------------------------------------------------------
revno: 0.1.60
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:17:32 +1000
message:
Weave eq and ne methods
modified:
weave.py
------------------------------------------------------------
revno: 0.1.61
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:17:54 +1000
message:
doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.62
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:38:45 +1000
message:
Lame command-line client for reading and writing weaves.
Doc.
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.63
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:42:48 +1000
message:
Abbreviate WeaveFormatError in some code
Doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.64
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:49:15 +1000
message:
Add test for merging versions
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.65
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:54:59 +1000
message:
Add Weave.merge_iter to get automerged lines
Add AutoMerge test case
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.66
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:56:55 +1000
message:
Cope without set/frozenset classes
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.67
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 00:59:30 +1000
message:
More fixes to try to run on python2.3
modified:
testsweet.py
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.68
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 21:05:20 +1000
message:
doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.69
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-29 23:58:16 +1000
message:
Simple text-based format for storing weaves, cleaner than
Python pickles.
added:
weavefile.py
modified:
weave.py
------------------------------------------------------------
revno: 0.1.70
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 16:51:39 +1000
message:
Ignore test.weave
modified:
.bzrignore
------------------------------------------------------------
revno: 0.1.71
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 16:52:31 +1000
message:
Log externalized weave from one test case
modified:
testweave.py
------------------------------------------------------------
revno: 0.1.72
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 16:54:45 +1000
message:
Go back to weave lines normally having newlines at the end.
Lines without final newlines are now serialized as ',' lines rather
than '.'.
modified:
weave.py
weavefile.py
------------------------------------------------------------
revno: 0.1.73
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 17:20:43 +1000
message:
Clean up assertions for weavefile
modified:
weavefile.py
------------------------------------------------------------
revno: 0.1.74
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 17:49:50 +1000
message:
Add format-hidden readwrite methods
modified:
weavefile.py
------------------------------------------------------------
revno: 0.1.75
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 17:58:00 +1000
message:
Remove VerInfo class; just store sets directly in the list of
versions.
Add tests for serialize/deserialize.
modified:
testweave.py
weave.py
weavefile.py
------------------------------------------------------------
revno: 0.1.76
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 18:11:11 +1000
message:
Script that tries conversion from bzr inventory into weave file
added:
tryconvert.py
------------------------------------------------------------
revno: 0.1.77
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 18:17:18 +1000
message:
New Weave.get_included() does transitive expansion
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.78
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 18:40:59 +1000
message:
Rename Weave.get_included to inclusions and getiter to get_iter
Refactor annotate() code
modified:
testweave.py
weave.py
------------------------------------------------------------
revno: 0.1.79
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 18:52:38 +1000
message:
In the weavefile, store only the minimum revisions added, not the full
list of parents.
modified:
weavefile.py
------------------------------------------------------------
revno: 0.1.80
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 19:26:10 +1000
message:
Add test code to convert from old storage to a weave
added:
convertfile.py
renamed:
tryconvert.py => convertinv.py
------------------------------------------------------------
revno: 0.1.81
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 19:38:14 +1000
message:
Avoid re-encoding versions which have not changed
when converting from old bzr stores
modified:
convertfile.py
------------------------------------------------------------
revno: 0.1.82
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 19:38:58 +1000
message:
Small weave optimizations
modified:
weave.py
------------------------------------------------------------
revno: 0.1.83
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 19:40:41 +1000
message:
Better delta basis calculation
modified:
weave.py
------------------------------------------------------------
revno: 0.1.84
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 19:43:08 +1000
message:
Refactor Weave._delta to calculate less unused information
modified:
weave.py
------------------------------------------------------------
revno: 0.1.85
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 20:00:57 +1000
message:
doc
modified:
weave.py
------------------------------------------------------------
revno: 0.1.86
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-06-30 20:03:13 +1000
message:
Remove dead code
modified:
weave.py
------------------------------------------------------------
revno: 0.1.87
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 12:36:27 +1000
message:
Show profile when converting inventory too.
modified:
convertinv.py
------------------------------------------------------------
revno: 0.1.88
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 13:08:44 +1000
message:
Add weave info command.
modified:
weave.py
------------------------------------------------------------
revno: 0.1.89
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 13:20:54 +1000
message:
Store SHA1 in weave file for later verification
modified:
weave.py
weavefile.py
------------------------------------------------------------
revno: 0.1.90
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 13:24:23 +1000
message:
Remove redundant 'v' lines from weave file
modified:
weavefile.py
------------------------------------------------------------
revno: 0.1.91
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 13:32:39 +1000
message:
Update Weave.check
Add new external check command that invokes it
Check sha1 sums for all versions
modified:
weave.py
------------------------------------------------------------
revno: 0.1.92
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 13:37:15 +1000
message:
Use proper relative path when converting a file from bzr
modified:
convertfile.py
------------------------------------------------------------
revno: 0.1.93
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 13:39:34 +1000
message:
Fix assertion with side effects
modified:
weavefile.py
------------------------------------------------------------
revno: 0.1.94
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-01 14:07:49 +1000
message:
Fix get_iter call
modified:
weave.py
------------------------------------------------------------
revno: 0.1.95
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-07-07 17:57:12 +1000
message:
- preliminary merge conflict detection
modified:
testweave.py
weave.py
weavefile.py
-------------- next part --------------
=== modified file 'TODO'
--- a/TODO 2005-07-07 08:02:16 +0000
+++ b/TODO 2005-07-07 10:13:43 +0000
@@ -17,6 +17,10 @@
Small things
------------
+* Merging add of a new file clashing with an existing file doesn't
+ work; add gets an error that it's already versioned and the merge
+ aborts.
+
* Merge should ignore the destination's working directory, otherwise
we get an error about the statcache when pulling from a remote
branch.
More information about the Pkg-bazaar-commits
mailing list