To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 1551.6.12.
- Committer: Aaron Bentley
- Date: 2006-04-08 23:57:33 UTC
- mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 1669.
- Revision ID: aaron.bentley@utoronto.ca-20060408235733-555b6583f267b843
Indicate conflicts from merge_lines, insead of guessing
- files added:
- .bzrignore
- bzrlib
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- bzrlib/util/urlgrabber
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- doc
- notes
- tools
- tools/doc_generate
- files removed:
- .bzrignore
- dulwich
- dulwich/bin
- dulwich/docs
- dulwich/dulwich
- dulwich/dulwich/tests
- dulwich/dulwich/tests/data
- dulwich/dulwich/tests/data/blobs
- dulwich/dulwich/tests/data/commits
- dulwich/dulwich/tests/data/packs
- dulwich/dulwich/tests/data/repos
- dulwich/dulwich/tests/data/repos/a
- dulwich/dulwich/tests/data/repos/a/.git
- dulwich/dulwich/tests/data/repos/a/.git/objects
- dulwich/dulwich/tests/data/repos/a/.git/objects/2a
- dulwich/dulwich/tests/data/repos/a/.git/objects/4e
- dulwich/dulwich/tests/data/repos/a/.git/objects/4f
- dulwich/dulwich/tests/data/repos/a/.git/objects/7d
- dulwich/dulwich/tests/data/repos/a/.git/objects/a2
- dulwich/dulwich/tests/data/repos/a/.git/objects/a9
- dulwich/dulwich/tests/data/repos/a/.git/objects/ff
- dulwich/dulwich/tests/data/repos/a/.git/objects/info
- dulwich/dulwich/tests/data/repos/a/.git/objects/pack
- dulwich/dulwich/tests/data/repos/a/.git/refs
- dulwich/dulwich/tests/data/repos/a/.git/refs/heads
- dulwich/dulwich/tests/data/repos/a/.git/refs/tags
- dulwich/dulwich/tests/data/repos/ooo_merge
- dulwich/dulwich/tests/data/repos/ooo_merge/.git
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/29
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/38
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/6f
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/70
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/76
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/90
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/95
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/b2
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/f5
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/f9
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/fb
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/info
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/objects/pack
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/refs
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/refs/heads
- dulwich/dulwich/tests/data/repos/ooo_merge/.git/refs/tags
- dulwich/dulwich/tests/data/repos/simple_merge
- dulwich/dulwich/tests/data/repos/simple_merge/.git
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/0d
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/1b
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/29
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/4c
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/5d
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/60
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/6f
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/70
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/90
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/95
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/ab
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/d4
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/d8
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/e6
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/info
- dulwich/dulwich/tests/data/repos/simple_merge/.git/objects/pack
- dulwich/dulwich/tests/data/repos/simple_merge/.git/refs
- dulwich/dulwich/tests/data/repos/simple_merge/.git/refs/heads
- dulwich/dulwich/tests/data/repos/simple_merge/.git/refs/tags
- dulwich/dulwich/tests/data/trees
- foreign
- tests
expand all
collapse all
added
removed
