Robert Collins
robertc at robertcollins.net
Thu Oct 27 14:45:26 CDT 2005
------------------------------------------------------------
revno: 1391
revision-id: robertc at robertcollins.net-20051027194518-58afabc9ab280bb0
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-27 15:45:18 -0400
message:
Merge from Martin
added:
bzrlib/selftest/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/selftest/testapi.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/selftest/testreweave.py testreweave.py-20051025042437-a2a02abae3551489
bzrlib/selftest/testsftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/selftest/testtsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/selftest/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/selftest/blackbox.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/selftest/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/selftest/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/selftest/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/selftest/testbranch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/selftest/testfetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/selftest/testnonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/selftest/teststatus.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/selftest/testworkingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/weave.py* knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
parent: mbp at sourcefrog.net-20051027034323-31ce572c5cdcbc45
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:44:57 +1000
message:
Fix tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027034323-31ce572c5cdcbc45
parent: mbp at sourcefrog.net-20051027033618-0ea59d3acff2b408
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:43:23 +1000
message:
Add check that the bzr program and bzrlib version match.
This may trap installation errors where bin/bzr is upgraded but not
bzrlib, or vice versa.
Change new variable to bzrlib.version_info to be consistent with
sys.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027033618-0ea59d3acff2b408
parent: mbp at sourcefrog.net-20051027032848-5edee386ede10b21
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:36:18 +1000
message:
Expose library API version in bzrlib.bzr_version_info
similar to sys.version_info.
Add tests for this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027032848-5edee386ede10b21
parent: mbp at sourcefrog.net-20051027032619-323471e9b77bd69a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:28:48 +1000
message:
[patch] paramiko sftp tests (robey)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027032619-323471e9b77bd69a
parent: mbp at sourcefrog.net-20051027022612-a259d9eacbe71552
parent: michael at ellerman.id.au-20051026100630-64c305951927e02a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:26:19 +1000
message:
[merge] Fixes and tests for strict commits (mpe)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026100630-64c305951927e02a
parent: michael at ellerman.id.au-20051026100347-bb0b2bd42f7953f2
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:06:30 +1000
message:
Fix error in run_bzr_captured() doco
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026100347-bb0b2bd42f7953f2
parent: michael at ellerman.id.au-20051019054013-518c59352d12019a
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:03:47 +1000
message:
Merge mainline.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
parent: mbp at sourcefrog.net-20051026055204-425ddb6e1457aac2
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:20:15 +1000
message:
Move weave errors into bzrlib.errors and make consistent with new system.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026055204-425ddb6e1457aac2
parent: mbp at sourcefrog.net-20051026054906-9a5608902d33bf8f
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 15:52:04 +1000
message:
Another topo_sort test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026054906-9a5608902d33bf8f
parent: mbp at sourcefrog.net-20051026023628-4fa68e04f44f5a13
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 15:49:06 +1000
message:
Improved topological sort
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026023628-4fa68e04f44f5a13
parent: mbp at sourcefrog.net-20051025232907-7c14ff3affd08906
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 12:36:28 +1000
message:
Add topo_sort utility function
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025232907-7c14ff3affd08906
parent: mbp at sourcefrog.net-20051025232422-babcb3f6fda554c3
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 09:29:07 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025232422-babcb3f6fda554c3
parent: mbp at sourcefrog.net-20051025071214-df55048f97f01917
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 09:24:22 +1000
message:
Add .sconsign* to default ignore list
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025071214-df55048f97f01917
parent: mbp at sourcefrog.net-20051025070730-af93bccefc008d4e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 17:12:14 +1000
message:
Refactor test setup/teardown into cleanup callbacks
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025070730-af93bccefc008d4e
parent: mbp at sourcefrog.net-20051025064159-10e7a898748bbf42
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 17:07:30 +1000
message:
Clean up test log files when tests complete.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025064159-10e7a898748bbf42
parent: mbp at sourcefrog.net-20051025050430-a0d658f0767aa56f
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 16:41:59 +1000
message:
Add TestCase.addCleanup method.
This is an alternative to overriding the tearDown() method, which tends to
cause confusion when subclasses want different cleanups, or cleanups that
should be done in only particular cases.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025050430-a0d658f0767aa56f
parent: mbp at sourcefrog.net-20051025044352-c562c69359d344d8
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 15:04:30 +1000
message:
Test for correct annotations after simple reweave
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025044352-c562c69359d344d8
parent: mbp at sourcefrog.net-20051025044326-48a847b93274442e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 14:43:52 +1000
message:
Split reweave tests into new file and add one more.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025044326-48a847b93274442e
parent: mbp at sourcefrog.net-20051025015221-007dbda9872fa88b
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 14:43:26 +1000
message:
- fix Weave.names()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025015221-007dbda9872fa88b
parent: mbp at sourcefrog.net-20051024235941-9a2711dfaa8a522d
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 11:52:21 +1000
message:
Add Weave.names()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024235941-9a2711dfaa8a522d
parent: mbp at sourcefrog.net-20051024235401-7f76b82a94d55621
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 09:59:41 +1000
message:
Fix up all calls to InvalidRevisionId() to specify parameters.
Pointed out by Jelmer.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024235401-7f76b82a94d55621
parent: mbp at sourcefrog.net-20051024121950-8d8cbc53f5a7da0b
parent: jelmer at samba.org-20051019234501-02d07eb6d5a0510e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 09:54:01 +1000
message:
[merge] small fixes from Jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051019234501-02d07eb6d5a0510e
parent: jelmer at samba.org-20051019105209-55ff676b4f3b0efe
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Thu 2005-10-20 01:45:01 +0200
message:
Fix typo
------------------------------------------------------------
merged: jelmer at samba.org-20051019105209-55ff676b4f3b0efe
parent: jelmer at samba.org-20051019093439-e1d8e3508d1ba46b
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Wed 2005-10-19 12:52:09 +0200
message:
InvalidRevisionId lost its argument
------------------------------------------------------------
merged: jelmer at samba.org-20051019093439-e1d8e3508d1ba46b
parent: jelmer at samba.org-20051018181306-96bd114e1f43f112
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Wed 2005-10-19 11:34:39 +0200
message:
Merge from Martin
------------------------------------------------------------
merged: jelmer at samba.org-20051018181306-96bd114e1f43f112
parent: jelmer at samba.org-20051018173958-64b4a27c64719927
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 20:13:06 +0200
message:
Properly import exception.
------------------------------------------------------------
merged: jelmer at samba.org-20051018173958-64b4a27c64719927
parent: jelmer at samba.org-20051017234828-c250f2060f104fcc
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 19:39:58 +0200
message:
Fix typo
------------------------------------------------------------
merged: jelmer at samba.org-20051017234828-c250f2060f104fcc
parent: jelmer at samba.org-20051017233140-9666fb5abe3b5f81
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:48:28 +0200
message:
Remove TODO item that is already implemented.
------------------------------------------------------------
merged: jelmer at samba.org-20051017233140-9666fb5abe3b5f81
parent: jelmer at samba.org-20051017231429-fa6f49e760ed2f22
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:31:40 +0200
message:
Argument 'transport' can not be a string (assert on first line
checks it is an instance of Transport). Removing this comment (there was also
no test for this behaviour)
------------------------------------------------------------
merged: jelmer at samba.org-20051017231429-fa6f49e760ed2f22
parent: jelmer at samba.org-20051017231343-1388004327a41b4a
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:14:29 +0200
message:
Remove executable properties from Makefile (set by bzr itself now)
------------------------------------------------------------
merged: jelmer at samba.org-20051017231343-1388004327a41b4a
parent: jelmer at samba.org-20051017132619-72b6d48f8ec48c49
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:13:43 +0200
message:
Make setup.py executable
------------------------------------------------------------
merged: jelmer at samba.org-20051017132619-72b6d48f8ec48c49
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Mon 2005-10-17 15:26:19 +0200
message:
Fix typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024121950-8d8cbc53f5a7da0b
parent: mbp at sourcefrog.net-20051024105058-49bdcfdb34d19bdd
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 22:19:50 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024105058-49bdcfdb34d19bdd
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:50:58 +1000
message:
Update fetch command for new Branch constructors.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
parent: mbp at sourcefrog.net-20051024100558-678a90e04ba42706
parent: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:22:01 +1000
message:
[merge] improve resign command (robertc)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024100558-678a90e04ba42706
parent: mbp at sourcefrog.net-20051024091557-81fd166614c71dd0
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:05:58 +1000
message:
Doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024091557-81fd166614c71dd0
parent: mbp at sourcefrog.net-20051024083738-b0ece45ea3b783b9
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 19:15:57 +1000
message:
Unconditionally fetch all new history during merge
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024083738-b0ece45ea3b783b9
parent: mbp at sourcefrog.net-20051024083722-791734e579375c9d
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:37:38 +1000
message:
More merge/fetch tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024083722-791734e579375c9d
parent: mbp at sourcefrog.net-20051024081707-3bb0882c4ff583b1
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:37:22 +1000
message:
Make weave.py executable as a script
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024081707-3bb0882c4ff583b1
parent: mbp at sourcefrog.net-20051024081252-b0b27a00a68d87a3
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:17:07 +1000
message:
New test that merge fetches revisions from source
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024081252-b0b27a00a68d87a3
parent: mbp at sourcefrog.net-20051024080750-8c60dd9c8e346198
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:12:52 +1000
message:
Fix trace message
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024080750-8c60dd9c8e346198
parent: mbp at sourcefrog.net-20051024074547-81a9806a45b2a88b
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:07:50 +1000
message:
API docs for merge
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024074547-81a9806a45b2a88b
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 17:45:47 +1000
message:
- add trace to merge
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019054013-518c59352d12019a
parent: michael at ellerman.id.au-20051019053733-fdbf18701d7ab8ea
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:40:13 +1000
message:
Fix doctest failure in Branch
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019053733-fdbf18701d7ab8ea
parent: michael at ellerman.id.au-20051019051845-1d3018be81222b18
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:37:33 +1000
message:
Strict commit was a little .. ah .. too strict, oops :}
branch.unknowns() returns a generator, so we can't do if branch.unknowns(),
it's always True.
if len(list(branch.unknowns())) might look cleanest, but creating the list of
unknowns is not cheap for large numbers of unknown files.
Instead we use a for loop to raise an exception as soon as we get one unknown
back from the generator.
Add more tests to make sure this doesn't break again.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019051845-1d3018be81222b18
parent: michael at concordia-20051019043528-6cf6dc8fe5e72bb2
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:18:45 +1000
message:
Undo double merge of strict commit
------------------------------------------------------------
merged: michael at concordia-20051019043528-6cf6dc8fe5e72bb2
parent: michael at ellerman.id.au-20051017115918-be3eadbee7ffa6fb
parent: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
committer: Michael Ellerman <michael at concordia>
timestamp: Wed 2005-10-19 14:35:28 +1000
message:
Merge from mainline.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051017115918-be3eadbee7ffa6fb
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Mon 2005-10-17 21:59:18 +1000
message:
Implement strict commits with --strict flag.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027022612-a259d9eacbe71552
parent: mbp at sourcefrog.net-20051027020153-20bf39a493557b9c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:26:12 +1000
message:
Test for 'name in weave'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027020153-20bf39a493557b9c
parent: mbp at sourcefrog.net-20051027020125-5e14fcc894afd240
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:01:53 +1000
message:
Add Weave.__contains__.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027020125-5e14fcc894afd240
parent: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:01:25 +1000
message:
Fix syntax of serializer_v5.pack_revision_to_string
*_to_string functions should return strings with a trailing newline.
Add tests for this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
parent: mbp at sourcefrog.net-20051027000207-deb15558011913b1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 10:53:09 +1000
message:
[patch] Close test log file before deleting, needed on Windows
(Alexander Belchenko)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027000207-deb15558011913b1
parent: mbp at sourcefrog.net-20051026234727-6b85ff2120f62cf0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 10:02:07 +1000
message:
Sort and clean up list of default ignores
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026234727-6b85ff2120f62cf0
parent: mbp at sourcefrog.net-20051026234028-db434f9bc9e84fbf
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 09:47:27 +1000
message:
Show exception class in error messages
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026234028-db434f9bc9e84fbf
parent: mbp at sourcefrog.net-20051026064515-b13cf1f96bf814dc
parent: abentley at panoramicfeedback.com-20051026160834-23cda6ed223ded07
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 09:40:28 +1000
message:
[merge] aaron
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026160834-23cda6ed223ded07
parent: abentley at panoramicfeedback.com-20051026135750-1076ead7e75afac2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 12:08:34 -0400
message:
Substituted branch_files for equivalent code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026135750-1076ead7e75afac2
parent: abentley at panoramicfeedback.com-20051026131719-17ef96584de39262
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 09:57:50 -0400
message:
Merged Martin's latest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026131719-17ef96584de39262
parent: abentley at panoramicfeedback.com-20051025231834-78f6025f59a16c8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 09:17:19 -0400
message:
Fixed add_suffix when renaming tree version to foo.THIS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025231834-78f6025f59a16c8b
parent: abentley at panoramicfeedback.com-20051025230939-c96bc00f6cf969c5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 19:18:34 -0400
message:
Updated NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025230939-c96bc00f6cf969c5
parent: abentley at panoramicfeedback.com-20051025222400-d8420bad3680928b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 19:09:39 -0400
message:
Made commit take branch from first argument, if supplied.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025222400-d8420bad3680928b
parent: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 18:24:00 -0400
message:
Updated news
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
parent: abentley at panoramicfeedback.com-20051024164918-4e3f89415dc6d7cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 13:42:46 -0400
message:
Handled conflicts with versioned files better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024164918-4e3f89415dc6d7cd
parent: abentley at panoramicfeedback.com-20051024160919-282458b455bf5b4e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 12:49:18 -0400
message:
Support for forcing merges of unrelated trees
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024160919-282458b455bf5b4e
parent: abentley at panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 12:09:19 -0400
message:
Updated docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
parent: abentley at panoramicfeedback.com-20051024150909-88bf8a581c631f6c
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 11:56:15 -0400
message:
Merge from mpool
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024150909-88bf8a581c631f6c
parent: abentley at panoramicfeedback.com-20051024145714-d3ae79be081f39d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 11:09:09 -0400
message:
Fixes for default ignores
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024145714-d3ae79be081f39d8
parent: abentley at panoramicfeedback.com-20051024141840-957302d19be73e7f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 10:57:14 -0400
message:
Added default ignores for Arch, autofoo, compiled files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024141840-957302d19be73e7f
parent: abentley at panoramicfeedback.com-20051024135749-64122a285339663d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 10:18:40 -0400
message:
Fixed obsolete help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024135749-64122a285339663d
parent: abentley at panoramicfeedback.com-20051024124852-c1214f7527292c30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 09:57:49 -0400
message:
Fixed pull help, renamed clobber to overwrite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024124852-c1214f7527292c30
parent: aaron.bentley at utoronto.ca-20051024044121-fc3059fae13e23e2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 08:48:52 -0400
message:
Fixed exception (No such thing as EncodingError that I can see)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024044121-fc3059fae13e23e2
parent: aaron.bentley at utoronto.ca-20051024005115-11eb6ff177fc195d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Mon 2005-10-24 00:41:21 -0400
message:
Fixed InvalidRevisionID handling in Branch.get_revision_xml
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024005115-11eb6ff177fc195d
parent: aaron.bentley at utoronto.ca-20051023234145-809a01974c2dc38b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 20:51:15 -0400
message:
Improved sort order of indirect merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023234145-809a01974c2dc38b
parent: aaron.bentley at utoronto.ca-20051023055504-118466d505ee4f52
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 19:41:45 -0400
message:
Added weave merge conflict to ExceptionConflictHandler
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023055504-118466d505ee4f52
parent: aaron.bentley at utoronto.ca-20051023052822-5d24a0faccc37a69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:55:04 -0400
message:
Updated NEWS, error out if --show-base supplied and unsupported
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023052822-5d24a0faccc37a69
parent: aaron.bentley at utoronto.ca-20051023052047-3b6e36d9548cda07
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:28:22 -0400
message:
Switched to standard 7-char conflict markers
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023052047-3b6e36d9548cda07
parent: aaron.bentley at utoronto.ca-20051023033827-00e09ee38fe6eb84
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:20:47 -0400
message:
Added conflict handling for weave merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023033827-00e09ee38fe6eb84
parent: aaron.bentley at utoronto.ca-20051023002617-d57101d2671509f7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 23:38:27 -0400
message:
got merge type selection under test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023002617-d57101d2671509f7
parent: aaron.bentley at utoronto.ca-20051023000410-ea7f59932e2d3777
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 20:26:17 -0400
message:
Preliminary weave merge support
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023000410-ea7f59932e2d3777
parent: aaron.bentley at utoronto.ca-20051022234501-236f63fda8c236ea
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 20:04:10 -0400
message:
Fix missing import
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051022234501-236f63fda8c236ea
parent: aaron.bentley at utoronto.ca-20051022232356-861a8b02872b132f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 19:45:01 -0400
message:
Restored merge type selection
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051022232356-861a8b02872b132f
parent: abentley at panoramicfeedback.com-20051021205609-004cda57d9f600fc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 19:23:56 -0400
message:
Added mode preservation to AtomicFile
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021205609-004cda57d9f600fc
parent: abentley at panoramicfeedback.com-20051021201536-08d19a910242bcd0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 16:56:09 -0400
message:
Fixed double-reporting of pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021201536-08d19a910242bcd0
parent: abentley at panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 16:15:36 -0400
message:
Show indirect merges in status
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
parent: abentley at panoramicfeedback.com-20051021193207-b995bd6ca86366ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 15:47:06 -0400
message:
Prevented all ancestors from being marked as pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021193207-b995bd6ca86366ac
parent: abentley at panoramicfeedback.com-20051021175916-fe9541771c0d7e4e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 15:32:07 -0400
message:
Refactored merge and merge_inner to use Merger
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021175916-fe9541771c0d7e4e
parent: abentley at panoramicfeedback.com-20051021170219-d00be37b77b15040
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 13:59:16 -0400
message:
Introduced transform_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021170219-d00be37b77b15040
parent: abentley at panoramicfeedback.com-20051021165153-bfb2a975b6d364c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 13:02:19 -0400
message:
Cleanup of merge.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021165153-bfb2a975b6d364c7
parent: abentley at panoramicfeedback.com-20051021163021-1e34da95b3cb56c3
parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 12:51:53 -0400
message:
Merge Martin's latest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021163021-1e34da95b3cb56c3
parent: aaron.bentley at utoronto.ca-20051021032845-9c9e306061a42651
parent: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 12:30:21 -0400
message:
Merged Robert Collins
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021032845-9c9e306061a42651
parent: aaron.bentley at utoronto.ca-20051021032050-88224a49b5001bb6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 23:28:45 -0400
message:
Merge3 cleanups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021032050-88224a49b5001bb6
parent: abentley at panoramicfeedback.com-20051020213453-796630baa6e08bf6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 23:20:50 -0400
message:
Removed b
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051020213453-796630baa6e08bf6
parent: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-20 17:34:53 -0400
message:
Ignored ^C in display commands
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026064515-b13cf1f96bf814dc
parent: mbp at sourcefrog.net-20051026063958-8742c9b5c23a9e8b
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:45:15 +1000
message:
More reweave tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026063958-8742c9b5c23a9e8b
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:39:58 +1000
message:
Reweave in topological-sort order.
Previous ad-hoc order could fail when the weaves contained extensively
different but still consistent graphs.
More information about the bazaar-commits
mailing list