Bazaar Mercurial Plugin to access BitBucket
Jelmer Vernooij
jelmer at samba.org
Thu Oct 20 10:56:37 UTC 2011
On 10/20/2011 07:06 AM, John Meinel wrote:
>
> Does dpush recognize multiple pushes? If I commit A B in one branch,
> switch to branch 2 and commit C D. Then I dpush branch 1, and then
> branch 2. Will branch 2 on the remote side share history with branch 1?
>
It depends. If you're pushing to a git or hg repository then they will
share history (same contents, so the revisions will have the same shas).
If you're pushing to a svn repository then they won't, because the
revision id will depend on the repository uuid and revision number which
will be different.
Cheers,
Jelmer
> On Oct 20, 2011 2:01 AM, "Jelmer Vernooij" <jelmer at samba.org
> <mailto:jelmer at samba.org>> wrote:
>
> On 10/19/2011 05:38 PM, Eli Zaretskii wrote:
>
> Date: Wed, 19 Oct 2011 17:19:39 +0200
> From: Jelmer Vernooij<jelmer at samba.org
> <mailto:jelmer at samba.org>>
> CC: bazaar at lists.canonical.com
> <mailto:bazaar at lists.canonical.com>
>
> Isn't it true that bzr-git does not yet support
> "push", only "dpush"?
>
> Yes, but that works pretty well too. I've been using it
> for all my
> contributions to Samba for the last year or so.
>
> Btw, as long as we are talking about this -- could you explain the
> difference between these two commands? The documentation just
> says
> laconically "without any custom bzr metadata", which sounds
> like only
> the plain diffs are sent upstream, is that true? If so, what
> happens
> to the history of my local branch if I merge from another
> branch and
> then dpush?
>
> "bzr push" is lossless, it either fails or preserves all data that
> is present in your local branch.
>
> "bzr dpush" is lossy, and pushes only data that can be represented
> natively in the remote format. This for example means that if the
> target format doesn't0 a concept of authors (versus committers),
> then author information will discarded (as is the case with svn).
> For git this means that revision properties (such as the data
> specified with "bzr commit --fixes...") are discarded)
>
> dpush will update your local branch to contain the same history as
> the remote branch, unless you specify --no-rebase. This means that
> after the dpush operation it will have a diverged history from
> that of branches which have not been stripped of unrepresentable
> data (in other words, branches which have not been dpushed).
>
> Cheers,
>
> Jelmer
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20111020/5c43cc2e/attachment-0001.html>
More information about the bazaar
mailing list