"Dale Worley" <dworley@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
Received on Tue Feb 22 17:44:56 2005