← Back to branch summary

~abentley/bzrtools/bzrtools.dev

~abentley/bzrtools/bzrtools.dev

Viewing all changes in revision 337.

Committer: Aaron Bentley
Date: 2006-03-18 17:14:51 UTC
mfrom: (0.1.98 shelf)
Revision ID: aaron.bentley@utoronto.ca-20060318171451-2b15a9bcf7b77d69

Merge from shelf

files added:
patches.py

testdata

testdata/diff

testdata/insert_top.patch

testdata/mod

testdata/orig

files removed:
.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/body

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/values

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/values

.be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93

.be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93/values

.be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8

.be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/values

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/body

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/values

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/values

branch_mark.py

branches.py

cbranch.py

colordiff.py

shove.py

switch.py

tests/clean_tree.py

upstream_import.py

zap.py

files renamed:
tests/blackbox.py => blackbox.py

rspush.py => push.py

obsolete/reweave_inventory.py => reweave_inventory.py

tests/shelf_tests.py => shelf_tests.py

files modified:
.be/bugs/1e6d3356-5668-47f3-b451-5285bcc0ec3b/values

.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/values

.be/bugs/da0f16ce-1ee0-4f9e-bf1a-9a78c4a7e765/values

.bzrignore

INSTALL

NEWS

NEWS.Shelf

README

README.Shelf

__init__.py

baz_import.py

bzrtools.py

clean_tree.py

errors.py

fetch_ghosts.py

hunk_selector.py

obsolete/bzr-push

patch.py

patchsource.py

shelf.py

shell.py

terminal.py

tests/__init__.py

tests/test_baz_import.py

userinteractor.py

Show diffs side-by-side

added added

removed removed

.be/bugs/1e6d3356-5668-47f3-b451-5285bcc0ec3b/values

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/body

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043/values

.be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/values

.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/values

.be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93/

.be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93/values

.be/bugs/da0f16ce-1ee0-4f9e-bf1a-9a78c4a7e765/values

.be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/

.be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8/values

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/body

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3/values

.be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/values

fetch_ghosts.py

hunk_selector.py

obsolete/bzr-push

testdata/insert_top.patch

tests/__init__.py

tests/clean_tree.py

tests/test_baz_import.py

upstream_import.py

userinteractor.py

Older »