Hi,

The attached small patch fixes a problem when parsing status of a bzr
tree with renamed files.

I am sending this as a bzr bundle, i.e., using the bzr send
command. Is that acceptable to the list?

You can merge this into your trees directly by saving the patch and
executing "bzr merge" on it, with no further network communication
necessary. The benefit for me is that I don't have to push to a public
branch which on my currently extremely slow network connections takes
a long time.

Best,
Bojan

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: ../main/
# testament_sha1: 2901b838777b3591b6fe8f4ac43a836f628f70de
# timestamp: 2008-07-01 07:36:21 +0100
# base_revision_id: [EMAIL PROTECTED]
# 
# Begin patch
=== modified file 'lisp/bzr.el'
--- lisp/bzr.el	2008-05-20 06:53:50 +0000
+++ lisp/bzr.el	2008-06-24 09:18:16 +0000
@@ -484,6 +484,9 @@
                   (setq current-status 'unknown))
                  ((string-equal msg "pending merges:")
                   (setq current-status nil))
+		 ((string-equal msg "renamed:")
+		  ;; Rename case is handled explictly below
+                  (setq current-status nil))
                  (t
                   (error "unrecognized label %s in bzr-parse-status" msg)))))
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY88Af8AAnhfgEAxUWP//1MB
EAC////wUAUMXgAy0EhIEJKEQxlNE9NNGU8QmIyaAGmTQwGgAAGgAAAAACU0miKaPJqeoaaPSGjQ
DTQB6QDAaAAAaAAAAAAJJAI0JiaZCmGU9RiBpNA9TTOqBw4kyd1FNhGz434DxKdPXOYhaEwU4xQZ
hfK6NIfJyyKoVeE+IKX67h6sc4RlQl8ejbZVTTQntQrVZWdX7jo9Zm3Nvw59Xm4TiRO/myY1lKzN
9yxm+KBFBzvQXb1szVnkuE5zC6OeEqWJ8Fr2MxEoM5AzYIcaHlxo25Z6cN4OL7KhPQsydWZLDThu
HchPQRx4HEhc0lNfnoksQ8PGbne71Ea9pi6YHg/cZgKTC6DIOYWUUk5IHbPTgRcVQrGUbD2IEyh8
YlyiwtxX6r8X9DLda2hbM9lvHWFw6BjigoSLz64oOVkHWLcYEi7HydgSGYRqmYEOF6rQWxwLXxQm
BwTxnnAkXkiwVhodx8w2mtCNCgzQDM4dhZmwQ4bC4ioVzc5Cqnu4jxyW52riJoFXfDiKKcGpsmMr
Sveal1wP1aG/QMA3ibWpxK3PfoQHnQTUK6uZwPQc9Xlwnl15WCQSCJF9ChrQHjygw4/WBMHmpIxw
hYj6INMLsagjMegeKgnsWxMX1KjgplMgRMqxgSsQTLnBuHESULzE60LjoYF1qsHSHSMQwE+agERN
9OBkxsGvyuzHmJjSWzEqBpLsEEMpptHukajuJFByEVCJEEhmHN0STI+YHsytRiljjjJq/CFRnLeM
tjscNTY668DDvMA2Fb8vTMDI/KAiKRlwC2wBfNv9xEwJg3xFRBBArznNJbDWagZwGHBI6Dntz0Oq
HOSXY8zp7zAjWR6ETE8Ox4lO9j3JK0mKIQf5n0xQ5DGXI36/A+B3DES4JoY2NSBkV3INjYqG65pw
Lyp1V/r8/fp5L9CdZaw2bnZmBSp6OVwcpMfErAXn0HzOGfgP5L0C0XisXh/7C4CZB66b6G14G7Ru
8NwoyFagOrggTWtTuGDdJQUjS0lxCwmYmFIrCde+qRMtajWQoioZwoEcOh0QZKVIJ74vRBFjB0Nw
qxA2cb2QRhUuxFAbIziGH+Cutr7bECRuQEdgeefZAWPN/Qig/WNs/mgOyCfJfZJcReIg197mLURe
ubFogtd9qSKS8S856omB9zkVDI/q0kdFxbKcCKMAZOSTMJhDiSZPOQRE6I5fI8kl+KFAIsg+7RV6
K0lJR9EyS2CC/ASD2IkYI5EiDQL1gi5wt1GyILb34xd5OXFxaiojUrwMqDm54ZmSkoMZQDn3Jaic
egmLhcyfZbwy3nbO4RuPIjiMk9XX1uHoZ2YHVBvqTCbAwmdvgww9mVAYbYI4G3nxcr1uqgHWIfyh
UWgaFA5CYVWvni4XufQXUqRCNhkJhhYDCwJH4Fa+uYODlMVosoPZ6IsiZcDwf7fHqkq9Sz+wrfiG
AqiZAUDBA1PZA3Ku9BI0QU9RMEBBqg10MDW0pE4aboVQJjEL/F3JFOFCQjzwB/w=
-- 
Bojan Nikolic          ||          http://www.bnikolic.co.uk
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to