Matthieu Moy <[EMAIL PROTECTED]> writes:

> Quoting Stefan Reichör <[EMAIL PROTECTED]>:
>
>> This feature works very well for me. I do the change in B, send it to
>> A. This undoes the changes on B also. On A I can apply the patch from
>> B.
>> 
>> I experimented a bit with bzr bundles for that purpose. The thing I
>> don't like here is, that I can see that the patch is from B.
>
> This is because you have to "merge" the bundles instead of pulling them.
>
> There was a discussion about this on bazaar-ng's ML a few days ago, with a
> workaround allowing to actually pull, and Aaron (the main contributor of the
> bundle features) agreed that implementing "pull" for bundles could be nice 
> also.

That sounds nice. bzr is really on the way to the "all singing and
dancing" revision control system ;-)

>> Consider the following scenario:
>> I do the main devolopment for DVC on my PC at home. I have installed
>> DVC on several machines at work. Now I want to fix a little issue for
>> DVC at work. The best solution for me is to send a patch to the
>> machine at home.
>
> You can also commit your changes on your machines at work. Depending on how 
> your
> internet acces is at work, you can also commit on your webserver.
>
> If you really want to delete all tracks of the fact that this was done at 
> work,
> with bzr and hg, you can send a real bundle, and apply it with patch on the
> other side.

That would work most of the time. Thanks for the tip.

>> Then I use gnus to apply the patch. That functionality is not yet
>> ready for bzr. But I will implement it, if Michael does not need that
>> kind of functionality.
>
> Doesn't M-x ediff-apply-patch RET already do this ?

Almost - yes. For tla I have the binding K t a to apply the changset to
the correct repository. Then I can start a commit and use C-c C-p to
use the log message from the mail. That is very convenient!

>> In short, I like that functionality and I will use it often.
>> I don't care, if we send patches or bundles. I am not sure, if it is
>> possible to send a bundle for a not yet committed patch.
>
> AFAIK, it's not possible currently. At worse, you can commit + send the 
> bundle +
> uncommit for bzr.

I played a bit with uncommit also. It seems that the uncommited
revision is kept in the repository. There should be a way to compact
the repository to delete unneeded revisions - or uncommit should do that.

> There's an ongoing discussion about considering the current state of the 
> working
> tree as a revision, so this might allow it later.

That would be the best solution for my working style.


Stefan.

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to