On Fri, Oct 28, 2011 at 2:00 PM, Andreas Krey wrote:
> That only looks like that because of the way merging is described in the
> book.
Aaah! RTFM, is it?
> In essence, svn sees only two different (and conflicting) changes to
> a block of lines, and leaves it to you to deal with that. (Likewise
On Fri, Oct 28, 2011 at 2:19 PM, Stefan Sperling wrote:
> Does this explanation make sense?
Yes, very much, thank you for taking your time to look into this for
me, I'm sorry to have inconvenienced you, but hopefully someone with
the same problem will find the thread and be enlightened.
--
Flem
On Fri, Oct 28, 2011 at 01:02:05PM +0200, Flemming Frandsen wrote:
> On Fri, Oct 28, 2011 at 12:58 PM, Andreas Krey wrote:
> > You didn't get a clean merge; you got a conflict. When you get a conflict,
> > it is your job to look at what you merged and at the proposed result,
> > and resolve it you
On Fri, 28 Oct 2011 13:02:05 +, Flemming Frandsen wrote:
...
> The problem is that there are many more changes in the conflicted
> block than the diff suggested, iow: svn merge tried to add more lines
> than svn diff said it would.
That only looks like that because of the way merging is descri
On Fri, Oct 28, 2011 at 12:58 PM, Andreas Krey wrote:
> You didn't get a clean merge; you got a conflict. When you get a conflict,
> it is your job to look at what you merged and at the proposed result,
> and resolve it yourself.
Yes, I have seen conflicts before, that's not what the problem is,
On Fri, 28 Oct 2011 12:49:35 +, Flemming Frandsen wrote:
...
> This is not the only time I've seen the problem manifest, but the
> circumstances where similar, in the other case another developer was
> trying to merge a change from version-1 to version-2, he too got extra
> changes in his merge
On Fri, Oct 28, 2011 at 12:31 PM, Johan Corveleyn wrote:
> Here is something I don't understand. You just did a new checkout to
> someotherpath. The HEAD of your repository is at least 648291. How
> come that someotherpath/stepws.xsd is at revision 610503? That doesn't
> make sense.
I'm sorry, I
On Fri, Oct 28, 2011 at 11:55 AM, Flemming Frandsen wrote:
> We're having a major problem with subversion, it seems that for some
> changesets svn merge will do a different change than svn diff would
> suggest.
>
> Here's an example of that the problem looks like:
>
>
> svn diff -c 648291 svn+ssh:
Am 28.10.2011 11:55, schrieb Flemming Frandsen:
We're having a major problem with subversion, it seems that for some
changesets svn merge will do a different change than svn diff would
suggest.
It took me a while of scrolling up and down to find the difference, but
IIUC the problem is A) that
On Fri, Oct 28, 2011 at 11:55:06AM +0200, Flemming Frandsen wrote:
> We're having a major problem with subversion, it seems that for some
> changesets svn merge will do a different change than svn diff would
> suggest.
This does indeed look like a bug in merge.
Is it possible for you to provide th
We're having a major problem with subversion, it seems that for some
changesets svn merge will do a different change than svn diff would
suggest.
Here's an example of that the problem looks like:
svn diff -c 648291 svn+ssh://myserver/somepath/stepws.xsd
Index: stepws.xsd
===
11 matches
Mail list logo
