dotted decimal for the win!
Robert Collins
robertc at robertcollins.net
Tue Oct 17 12:01:27 BST 2006
The log below shows something very interesting that count-from-branch
point gives, which the count-to-merge-point probably wouldn't have.. it
shows revision 121.1.1 was committed against 121, and merged 120.2.3
which was Alexanders win32 fixes, and this resulting branch (121.1) was
then merged as a whole into 122. So this gives a visual feel to 'there
were two branches here' - the extra lines that we've cut from bzr viz
because they were to complex to display - without actually adding
complexity to the simple visual take it in.
I'm *really* happy about this :)
-Rob
------------------------------------------------------------
revno: 123
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: shelf-dev
timestamp: Tue 2006-07-18 11:53:26 +1000
message:
Update ignores
------------------------------------------------------------
revno: 122
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: shelf-dev
timestamp: Mon 2006-06-19 17:27:19 +1000
message:
Merge win32 fixes from Alexander.
------------------------------------------------------------
revno: 121.1.2
merged: bialix at ukr.net-20060618140341-ba15f4a55bdee5d6
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: shelf.bialix
timestamp: Sun 2006-06-18 17:03:41 +0300
message:
Shelf selftest win32-fixes: write all files in binary mode,
because tests expect LF-only line-endings
------------------------------------------------------------
revno: 121.1.1
merged: michael at ellerman.id.au-20060617064134-1dd813742ee1dea4
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: shelf-win32
timestamp: Sat 2006-06-17 16:41:34 +1000
message:
Win32 fixes from Alexander, slightly reworked by me.
------------------------------------------------------------
revno: 120.2.3
merged: bialix at ukr.net-20060615111124-848b2f1dca3280d8
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: shelf.bialix
timestamp: Thu 2006-06-15 14:11:24 +0300
message:
win32 workaround for renaming to already existing file
------------------------------------------------------------
revno: 120.2.2
merged: bialix at ukr.net-20060615110055-4e1f8e20a4d1f289
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: shelf.bialix
timestamp: Thu 2006-06-15 14:00:55 +0300
message:
[win32] run patch utility with --binary flag on win32 to avoid problems with line-endings
------------------------------------------------------------
revno: 120.2.1
merged: bialix at ukr.net-20060615103319-d66c46769262859d
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: shelf.bialix
timestamp: Thu 2006-06-15 13:33:19 +0300
message:
fix import and usage of msvcrt to get user input on win32
------------------------------------------------------------
revno: 121
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: shelf-dev
timestamp: Fri 2006-06-16 13:48:48 +1000
message:
Use bzrlib.patches, thanks to Aaron.
------------------------------------------------------------
revno: 120.1.1
merged: aaron.bentley at utoronto.ca-20060615040436-8acba8889ead9de0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: shelf
timestamp: Thu 2006-06-15 00:04:36 -0400
message:
Use bzrlib.patches instead of a separate copy
------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061017/1aac9747/attachment.pgp
More information about the bazaar
mailing list