Rev 1999: (moy) fixes for revno:N:branch/path in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Sep 11 17:55:32 BST 2006
------------------------------------------------------------
revno: 1999
revision-id: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: john at arbash-meinel.com-20060911162245-225331216fd26a9f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 17:55:31 +0100
message:
(moy) fixes for revno:N:branch/path
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911162245-225331216fd26a9f
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-09-11 11:22:45 -0500
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
parent: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:34:51 +0200
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 14:03:10 +0530
message:
Better testcase for revno:N:branch/path error.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
parent: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:57:14 +0530
message:
Made merge work with two revisions in different branches.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
parent: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:28:50 +0530
message:
Canceled an incorrect "path = None".
Indeed, the "path" problem is managed in the revisionspec for revno:N:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
parent: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:37:02 +0530
message:
Cut long lines, prevent "path" component from being used in revno:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
parent: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:28:15 +0530
message:
missing newline
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
parent: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:26:03 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-08-28 12:17:41 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:26:10 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:18:23 +0530
message:
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
parent: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 16:54:13 +0530
message:
Explain the error messages in the code.
Keep the errors for merge and log called with two revno:N:path with
different paths, but add a comment to explain why.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
parent: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:43:16 +0530
message:
bzr cat now works nicely with revno:N:path too
(even outside a branch or working tree).
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
parent: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:01:40 +0530
message:
Make log work nicely with revno:N:path too.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 20:39:48 +0530
message:
Fixed merge to work nicely with -r revno:N:path
More information about the bazaar-commits
mailing list