You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Markus Dehmann <ma...@gmail.com> on 2005/02/21 04:15:40 UTC
many "conflicts" that are not really conflicts
I created a branch at revision 1685. I modified the branch a lot,
created new files etc. Then, I wanted to merge it back to the trunk.
But, it shows lots of ridiculous pseudo-conflicts, like:
<<<<<<< .working
# $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
=======
# $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
>>>>>>> .merge-right.r1978
What is that? The lines are exactly the same. Why is it showing a
conflict? I can't believe I have to edit all these files by hand now.
BTW, I merged the trunk back to head as described here:
http://svnbook.red-bean.com/en/1.0/re16.html
BTW, I didn't find an easy way to find out at which revision my branch
was created. I ended up using this command:
svn log -v file:///path/to/branches | grep my_branch | grep from
But there must be a better way to do this?!
Thanks!
Markus
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: many "conflicts" that are not really conflicts
Posted by Adam Gibson <ag...@ptm.com>.
Ben Collins-Sussman wrote:
>
> On Feb 20, 2005, at 10:15 PM, Markus Dehmann wrote:
>
>>
>> BTW, I didn't find an easy way to find out at which revision my branch
>> was created. I ended up using this command:
>> svn log -v file:///path/to/branches | grep my_branch | grep from
>>
>> But there must be a better way to do this?!
>>
>
> Of course there is: run 'svn log --stop-on-copy'. There's even a
> special side-box in chapter 4 that describes this as a good way of
> finding a branch's birth revision.
It would be nice to have a --stop-on-pathcopy "/myproj/branches". Has
anyone thought about that possible feature?
With that feature you could stop when you copy to a branch or with
"/myproj/tags" you could stop on the last copy to the tags directory.
That would sure make my life easier anyway :).
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: many "conflicts" that are not really conflicts
Posted by Ben Collins-Sussman <su...@collab.net>.
On Feb 20, 2005, at 10:15 PM, Markus Dehmann wrote:
>
> BTW, I didn't find an easy way to find out at which revision my branch
> was created. I ended up using this command:
> svn log -v file:///path/to/branches | grep my_branch | grep from
>
> But there must be a better way to do this?!
>
Of course there is: run 'svn log --stop-on-copy'. There's even a
special side-box in chapter 4 that describes this as a good way of
finding a branch's birth revision.
(By the way, you probably should be reading the 1.1 version of the
book, not 1.0, unless you're really using an old 1.0 client.)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: many "conflicts" that are not really conflicts
Posted by kf...@collab.net.
Hmmm. That conflict thing looks bogus, yeah. Would you mind
reporting that as a bug on the dev@subversion.tigris.org list, and
we'll see what the conflict-code experts have to say?
Thanks,
-Karl
Markus Dehmann <ma...@gmail.com> writes:
> I created a branch at revision 1685. I modified the branch a lot,
> created new files etc. Then, I wanted to merge it back to the trunk.
>
> But, it shows lots of ridiculous pseudo-conflicts, like:
>
> <<<<<<< .working
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> =======
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> >>>>>>> .merge-right.r1978
>
> What is that? The lines are exactly the same. Why is it showing a
> conflict? I can't believe I have to edit all these files by hand now.
>
> BTW, I merged the trunk back to head as described here:
> http://svnbook.red-bean.com/en/1.0/re16.html
>
> BTW, I didn't find an easy way to find out at which revision my branch
> was created. I ended up using this command:
> svn log -v file:///path/to/branches | grep my_branch | grep from
>
> But there must be a better way to do this?!
>
> Thanks!
> Markus
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: many "conflicts" that are not really conflicts
Posted by Jacob Atzen <ja...@aub.dk>.
On Sun, Feb 20, 2005 at 11:15:40PM -0500, Markus Dehmann wrote:
> BTW, I didn't find an easy way to find out at which revision my branch
> was created. I ended up using this command:
> svn log -v file:///path/to/branches | grep my_branch | grep from
>
> But there must be a better way to do this?!
svn log --stop-on-copy
Though it will only tell you when the branch was copied, your merge
history will still need to be manually tracked.
--
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: many "conflicts" that are not really conflicts
Posted by Rainer Müller <mu...@gmx.de>.
Markus Dehmann wrote:
> I created a branch at revision 1685. I modified the branch a lot,
> created new files etc. Then, I wanted to merge it back to the trunk.
>
> But, it shows lots of ridiculous pseudo-conflicts, like:
>
> <<<<<<< .working
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> =======
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
>
>>>>>>>>.merge-right.r1978
Did you remove "Id" from svn:keywords so the expansion is now marked as
a conflict?
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: many "conflicts" that are not really conflicts
Posted by kf...@collab.net.
"Dale Worley" <dw...@pingtel.com> writes:
> > From: Markus Dehmann [mailto:markus.dehmann@gmail.com]
> >
> > I created a branch at revision 1685. I modified the branch a lot,
> > created new files etc. Then, I wanted to merge it back to the trunk.
> >
> > But, it shows lots of ridiculous pseudo-conflicts, like:
> >
> > <<<<<<< .working
> > # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> > =======
> > # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> > >>>>>>> .merge-right.r1978
> >
> > What is that? The lines are exactly the same. Why is it showing a
> > conflict? I can't believe I have to edit all these files by hand now.
>
> When I get things like this, and check them out carefully, I discover that
> the whitespace on the lines is not the same. In your case, you are using a
> keyword, and it seems to me that it is possible that the two branches have
> slightly different versions of the keyword, but they look the same after the
> substitution has been done.
Oh, good thinking. For example, the repository texts (i.e., the text
bases) might have
$Id:$
and
$Id: $
Markus, is this the case?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: many "conflicts" that are not really conflicts
Posted by Dale Worley <dw...@pingtel.com>.
> From: Markus Dehmann [mailto:markus.dehmann@gmail.com]
>
> I created a branch at revision 1685. I modified the branch a lot,
> created new files etc. Then, I wanted to merge it back to the trunk.
>
> But, it shows lots of ridiculous pseudo-conflicts, like:
>
> <<<<<<< .working
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> =======
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> >>>>>>> .merge-right.r1978
>
> What is that? The lines are exactly the same. Why is it showing a
> conflict? I can't believe I have to edit all these files by hand now.
When I get things like this, and check them out carefully, I discover that
the whitespace on the lines is not the same. In your case, you are using a
keyword, and it seems to me that it is possible that the two branches have
slightly different versions of the keyword, but they look the same after the
substitution has been done.
Dale
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org