← Back to branch summary

~abentley/bzrtools/bzrtools.dev

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to testdata/insert_top.patch

Committer: Aaron Bentley
Date: 2007-12-21 04:03:41 UTC
mfrom: (596.1.1 bzrtools)
Revision ID: aaron.bentley@utoronto.ca-20071221040341-pi6g35z6su4wou8k

Merge from other bzrtools

files added:
.be/bugs/0fc1fb5e-c545-453c-999d-5fc5ef852ca5

.be/bugs/0fc1fb5e-c545-453c-999d-5fc5ef852ca5/values

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/a68c4dc0-c796-4747-b7a1-60bee9fb2c86

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/a68c4dc0-c796-4747-b7a1-60bee9fb2c86/body

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/a68c4dc0-c796-4747-b7a1-60bee9fb2c86/values

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/aa6140d3-b4a7-46c3-abae-4c7b8a3523ce

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/aa6140d3-b4a7-46c3-abae-4c7b8a3523ce/body

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/comments/aa6140d3-b4a7-46c3-abae-4c7b8a3523ce/values

.be/bugs/1804f828-abfe-4433-b287-7560ff9ea354/values

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

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

.be/bugs/4ddc9130-fe72-4d0c-9848-157ad6f2c14d

.be/bugs/4ddc9130-fe72-4d0c-9848-157ad6f2c14d/values

.be/bugs/55bd43ce-953b-4233-83d2-2034ea63a805

.be/bugs/55bd43ce-953b-4233-83d2-2034ea63a805/values

.be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b

.be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments

.be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments/298847ed-8d6a-416f-a3aa-4fd6d3f3417b

.be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments/298847ed-8d6a-416f-a3aa-4fd6d3f3417b/body

.be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/comments/298847ed-8d6a-416f-a3aa-4fd6d3f3417b/values

.be/bugs/5be3aa64-4585-49e4-8479-172c67afcc1b/values

.be/bugs/7c3b4f3e-33c5-4112-b8df-c209ec6cc8b6

.be/bugs/7c3b4f3e-33c5-4112-b8df-c209ec6cc8b6/values

.be/bugs/83031098-bd41-4159-852d-eec95740ab19

.be/bugs/83031098-bd41-4159-852d-eec95740ab19/comments

.be/bugs/83031098-bd41-4159-852d-eec95740ab19/comments/5aa94e9e-8a61-4bb1-aa74-b50428b8324c

.be/bugs/83031098-bd41-4159-852d-eec95740ab19/comments/5aa94e9e-8a61-4bb1-aa74-b50428b8324c/body

.be/bugs/83031098-bd41-4159-852d-eec95740ab19/comments/5aa94e9e-8a61-4bb1-aa74-b50428b8324c/values

.be/bugs/83031098-bd41-4159-852d-eec95740ab19/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/945dc3f8-75e1-4312-b56d-9ecb02310783

.be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments

.be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments/5c42de60-2f51-48a0-9756-dcef5f6955ab

.be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments/5c42de60-2f51-48a0-9756-dcef5f6955ab/body

.be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/comments/5c42de60-2f51-48a0-9756-dcef5f6955ab/values

.be/bugs/945dc3f8-75e1-4312-b56d-9ecb02310783/values

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

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

.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713

.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713/body

.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713/values

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

.be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f

.be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments

.be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments/0978c6a8-194e-4437-b3fc-2c99adf96499

.be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments/0978c6a8-194e-4437-b3fc-2c99adf96499/body

.be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/comments/0978c6a8-194e-4437-b3fc-2c99adf96499/values

.be/bugs/b394a88a-3ecc-4058-8e29-4ebdbf96c95f/values

.be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3

.be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments

.be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments/4946aca8-392b-4d95-ae22-65c1a38d842c

.be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments/4946aca8-392b-4d95-ae22-65c1a38d842c/body

.be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/comments/4946aca8-392b-4d95-ae22-65c1a38d842c/values

.be/bugs/b47ef4d6-6a96-44ad-9694-6dd2c855d9c3/values

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

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

.be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab

.be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments

.be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments/3448c47d-def5-4d03-9b8c-f0968e0c787c

.be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments/3448c47d-def5-4d03-9b8c-f0968e0c787c/body

.be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/comments/3448c47d-def5-4d03-9b8c-f0968e0c787c/values

.be/bugs/be87c595-f555-4bce-a12a-9eeefc7349ab/values

.be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592

.be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments

.be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments/f752631b-5590-4b6f-86d9-57aadca441ce

.be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments/f752631b-5590-4b6f-86d9-57aadca441ce/body

.be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/comments/f752631b-5590-4b6f-86d9-57aadca441ce/values

.be/bugs/c4664fbc-3b6a-48a6-bc09-9e96fa250592/values

.be/bugs/c59acbbf-25f4-450a-9a8f-7a6a45b3985e

.be/bugs/c59acbbf-25f4-450a-9a8f-7a6a45b3985e/values

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

.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

.bzrignore

CREDITS

NEWS.Shelf

PACKAGERS

README.Shelf

TODO

TODO.Shelf

__init__.py

baz_helper.py

branches.py

branchhistory.py

cbranch.py

clean_tree.py

colordiff.py

command.py

dotgraph.py

errors.py

external

fetch_ghosts.py

graph.py

hunk_selector.py

obsolete/reweave_inventory.py

patch.py

patches

patchsource.py

release.py

setup.py

shelf.py

shell.py

show_paths.py

terminal.py

test.py

tests

tests/__init__.py

tests/blackbox.py

tests/clean_tree.py

tests/is_clean.py

tests/shelf_tests.py

tests/test_baz_import.py

tests/test_rspush.py

tests/upstream_import.py

upstream_import.py

userinteractor.py

version.py

zap.py

files removed:
.bzrignore

__init__.py

debian

debian/changelog

debian/compat

debian/control

debian/copyright

debian/dirs

debian/docs

debian/install

debian/rules

patches.py

shelf.py

testdata

testdata/diff

testdata/insert_top.patch

testdata/mod

testdata/orig

files renamed:
annotate.py => obsolete/annotate.py

baz2bzr => obsolete/baz2bzr

bzr-push => obsolete/bzr-push

shelve => obsolete/shelve

unshelve => obsolete/unshelve

push.py => rspush.py

files modified:
INSTALL

NEWS

README

baz_import.py

bzrtools.py

progress.py

Show diffs side-by-side

added added

removed removed

testdata/insert_top.patch

1

--- orig/pylon/patches.py

2

+++ mod/pylon/patches.py

3

@@ -1,3 +1,4 @@

4

+#test

5

import util

6

import sys

7

class PatchSyntax(Exception):

Older »