Michael Gerz <[EMAIL PROTECTED]> writes:
| Georg Baum wrote:
|
| > That is the same with the other procedure. The key is the
| > revision. You can't do anything wrong with both
| > methods if that one is right. With your method you need to remember
| > it somewhere, with the one described on the
Peter Kümmel wrote:
Georg Baum wrote:
So if you want to be nice, merge everything up to the revision of your
changes. Otherwise, don't merge anything.
Oh, I see, it would have been better to send patches to Abdel instead
of checking in some stuff, when I don't wanna a complete merge by mysel
Georg Baum wrote:
> Am Donnerstag, 15. Juni 2006 13:39 schrieb Peter Kümmel:
>
>> I think the only branches I have to care about is my own and trunk.
>> And when a update someone other branch it is just niceness to the
>> owner of this branch, because he is responsible for his branch.
>
> I agree
Am Donnerstag, 15. Juni 2006 13:39 schrieb Peter Kümmel:
> I think the only branches I have to care about is my own and trunk.
> And when a update someone other branch it is just niceness to the
> owner of this branch, because he is responsible for his branch.
I agree 100%. My point however is th
Georg Baum wrote:
> I just wanted to do Abdel a favour and merged my latest changes to his
> branch. I discovered that it already included Peters latest changes, but
> e.g. not the latest scons work by Bo.
> That makes working with branches more difficult than it should be, so
> please follow th
Michael Gerz wrote:
Georg Baum wrote:
That is the same with the other procedure. The key is the
revision. You can't do anything wrong with both methods
if that one is right. With your method you need to remember it
somewhere, with the one described on the wiki you can get it from svn.
Mos
Abdelrazak Younes wrote:
I use TortoiseSVN merging capability:
1) In the trunk revision history I select the oldest non merged commit
and those upward. But I stop my slection before a revision that I feel
is problematic.
2) I merge the selected commits. This is "Merge step 1"
3) I select a
Georg Baum wrote:
That is the same with the other procedure. The key is the
revision. You can't do anything wrong with both methods if that one is
right. With your method you need to remember it somewhere, with the one
described on the wiki you can get it from svn.
Most important: Merging
Michael Gerz wrote:
Abdel, what is your approach? We really have to make sure that our
branch experiment does not end in a massacre!
I use TortoiseSVN merging capability:
1) In the trunk revision history I select the oldest non merged commit
and those upward. But I stop my slection before a
Am Donnerstag, 15. Juni 2006 10:22 schrieb Michael Gerz:
> Georg Baum wrote:
>
> >If you merge something to a branch that is intended to follow the
trunk,
> >merge everything up to the desired revision, and not only parts of it.
> >
> >If you don't know how to do that: One possible way is explai
Georg Baum wrote:
If you merge something to a branch that is intended to follow the trunk,
merge everything up to the desired revision, and not only parts of it.
If you don't know how to do that: One possible way is explained at
http://wiki.lyx.org/devel/pmwiki.php/DevelTips/Branches
I fol
Georg Baum wrote:
I just wanted to do Abdel a favour
Thanks ;-)
and merged my latest changes to his
branch. I discovered that it already included Peters latest changes, but
e.g. not the latest scons work by Bo.
Actually, your changes and Peter's changes were more than simple merge
because
Am Mittwoch, 14. Juni 2006 21:24 schrieb Bo Peng:
> I think Peter voluntarily applied his patched to the branch since they
> are working on similar things, that does not mean it is a good idea to
> depart further and further away from trunk though.
I know that Peter did that with good intentions.
On 6/14/06, Georg Baum <[EMAIL PROTECTED]> wrote:
I just wanted to do Abdel a favour and merged my latest changes to his
branch. I discovered that it already included Peters latest changes, but
e.g. not the latest scons work by Bo.
I think Peter voluntarily applied his patched to the branch sin
I just wanted to do Abdel a favour and merged my latest changes to his
branch. I discovered that it already included Peters latest changes, but
e.g. not the latest scons work by Bo.
That makes working with branches more difficult than it should be, so
please follow this simple rule:
If you merg
15 matches
Mail list logo
