Rev 1638: (mbp/olaf) push/pull/merge --remember improvements in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Apr 14 00:16:59 BST 2006
------------------------------------------------------------
revno: 1638
revision-id: pqm at pqm.ubuntu.com-20060413231657-bce3d67d3e7a4f2b
parent: pqm at pqm.ubuntu.com-20060413223715-b826d3cb591fed82
parent: mbp at sourcefrog.net-20060413230317-a1543afe041b1266
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-14 00:16:57 +0100
message:
(mbp/olaf) push/pull/merge --remember improvements
added:
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
renamed:
bzrlib/tests/test_uncommit.py => bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413230317-a1543afe041b1266
parent: pqm at pqm.ubuntu.com-20060413223715-b826d3cb591fed82
parent: mbp at sourcefrog.net-20060413225424-de4f151d9ea1216d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-14 09:03:17 +1000
message:
[merge] push/pull/merge --remember
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060413225424-de4f151d9ea1216d
parent: pqm at pqm.ubuntu.com-20060413095251-762ef0074ed6104a
parent: olaf at conradi.org-20060409144557-99402eb1485732f8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.remember
timestamp: Fri 2006-04-14 08:54:24 +1000
message:
[merge] olaf's --remember changes
------------------------------------------------------------
merged: olaf at conradi.org-20060409144557-99402eb1485732f8
parent: olaf at conradi.org-20060409142856-940e51e1df9176b3
parent: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-09 16:45:57 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060409142856-940e51e1df9176b3
parent: olaf at conradi.org-20060402023813-78338fad14850cba
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-09 16:28:56 +0200
message:
Modified blackbox test cases to use bzrlib API.
------------------------------------------------------------
merged: olaf at conradi.org-20060402023813-78338fad14850cba
parent: olaf at conradi.org-20060402023512-18754201284048f0
parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-02 04:38:13 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060402023512-18754201284048f0
parent: olaf at conradi.org-20060329210720-8e43fffa2a24d1a4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Sun 2006-04-02 04:35:12 +0200
message:
Add test case for resetting parent in branch_implementations.
------------------------------------------------------------
merged: olaf at conradi.org-20060329210720-8e43fffa2a24d1a4
parent: olaf at conradi.org-20060329014430-7c2af77c08efc1e3
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 23:07:20 +0200
message:
Re-added AmbiguousBase with a deprecated warning.
------------------------------------------------------------
merged: olaf at conradi.org-20060329014430-7c2af77c08efc1e3
parent: olaf at conradi.org-20060329010056-71604a1f901d8c8d
parent: pqm at pqm.ubuntu.com-20060328190455-9eab3a4045b61c4a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 03:44:30 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060329010056-71604a1f901d8c8d
parent: olaf at conradi.org-20060329004804-83f9d686c6b77490
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 03:00:56 +0200
message:
Add NEWS entries.
------------------------------------------------------------
merged: olaf at conradi.org-20060329004804-83f9d686c6b77490
parent: olaf at conradi.org-20060329004354-bfa27afb37ff0c1f
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 02:48:04 +0200
message:
Move test_uncommit to blackbox tests.
------------------------------------------------------------
merged: olaf at conradi.org-20060329004354-bfa27afb37ff0c1f
parent: olaf at conradi.org-20060328233002-f6262df0e19c1963
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 02:43:54 +0200
message:
Added testcases for using push with --remember. Moved remember code to
beginning of cmd_push. This remembers the location in case of a failure
during push.
------------------------------------------------------------
merged: olaf at conradi.org-20060328233002-f6262df0e19c1963
parent: olaf at conradi.org-20060327221957-20e59274772fbfc2
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Wed 2006-03-29 01:30:02 +0200
message:
Added testcases for using pull with --remember. Moved remember code to
beginning of cmd_pull. This remembers the location in case of a failure
during pull.
------------------------------------------------------------
merged: olaf at conradi.org-20060327221957-20e59274772fbfc2
parent: olaf at conradi.org-20060327210819-c12de75f9f81dfb8
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Tue 2006-03-28 00:19:57 +0200
message:
Remove exception AmbiguousBase from cmd_merge. New base selection code
does not raise it and and no test-case existed to test it.
------------------------------------------------------------
merged: olaf at conradi.org-20060327210819-c12de75f9f81dfb8
parent: olaf at conradi.org-20060323230008-8553da6ea86bf149
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.remember
timestamp: Mon 2006-03-27 23:08:19 +0200
message:
Add testcase for --remember when merge fails. It should still remember
the location. Testcase exposed a bug. When merge raised an exception,
the location was not remembered. Fixed by moving remember code before
actual merging.
------------------------------------------------------------
merged: olaf at conradi.org-20060323230008-8553da6ea86bf149
parent: olaf at conradi.org-20060323193649-06b5956b1d238711
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Fri 2006-03-24 00:00:08 +0100
message:
Added testcase for bzr merge --remember.
Changed branch.set_parent() to accepts None to remove parent.
------------------------------------------------------------
merged: olaf at conradi.org-20060323193649-06b5956b1d238711
parent: olaf at conradi.org-20060321105123-c3778431c6f3f6a2
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Thu 2006-03-23 20:36:49 +0100
message:
Renamed argument location in command merge back to branch.
------------------------------------------------------------
merged: olaf at conradi.org-20060321105123-c3778431c6f3f6a2
parent: olaf at conradi.org-20060321101728-09fe24e3e9cd93d9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Tue 2006-03-21 11:51:23 +0100
message:
In commands push and pull, moved help text for --remember down. It's not
the first thing a user should know about.
------------------------------------------------------------
merged: olaf at conradi.org-20060321101728-09fe24e3e9cd93d9
parent: olaf at conradi.org-20060318001257-bdb0088faae84e76
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Tue 2006-03-21 11:17:28 +0100
message:
Merge command:
* Remember location if merge failed.
* Rename some variables to clarify their use.
* Moved help text for --remember down to examples.
------------------------------------------------------------
merged: olaf at conradi.org-20060318001257-bdb0088faae84e76
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf
timestamp: Sat 2006-03-18 01:12:57 +0100
message:
Merge now accepts option --remember to set parent location (closes #35350).
More information about the bazaar-commits
mailing list