Windows file locking with bzr 2.2.3
W. Trevor King
wking at drexel.edu
Thu Feb 24 22:26:28 UTC 2011
On Thu, Feb 24, 2011 at 04:19:46PM -0600, John Arbash Meinel wrote:
> You specified "file_ids_from" which states "look in this tree for the
> file-ids to use for the files I'm adding". But that doesn't make sense
> to use the target tree, since it (by definition) doesn't contain the
> files you are adding.
Note that the docs say:
--file-ids-from will try to use the file ids from the supplied path.
It looks up ids trying to find a matching parent directory with the
same filename, and then by pure path. This option is rarely needed
but can be useful when adding the same logical file into two
branches that will be merged later (without showing the two different
adds as a conflict). It is also useful when merging another project
into a subdirectory of this one.
It should perhaps say, as you just did,
--file-ids-from will try to use the file ids from the supplied tree.
or similar to draw a clearer distinction between 'tree/repo' and
'path/directory'.
--
This email may be signed or encrypted with GPG (http://www.gnupg.org).
The GPG signature (if present) will be attached as 'signature.asc'.
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
My public key is at http://www.physics.drexel.edu/~wking/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110224/6513e684/attachment-0001.pgp>
More information about the bazaar
mailing list