On Fri, Jul 27, 2012 at 08:03:22AM -0700, Arunmozhi wrote:
>
> I am resending the initial mail as the mail format other than text is not
> supported.
>
> I feel that the SVN branching and merging/integration algorithm is
> flawed. However I am not sure if this is a known limitation of SVN. I
>
final integrated file is
shown below.
a
d
b
c
d
z
The expected output for the second test as verified in perforce and git is
a
d
b
c
z
Hope now it clarifies the problem.
- Original Message -----
From: Stefan Sperling
To: Arunmozhi
Cc: "users@subversion.apache.org"
Sent: Frida
hi
Cc: "users@subversion.apache.org"
Sent: Friday, 27 July 2012 7:06 PM
Subject: Re: Issue with merge/integration algorithm?
On Fri, Jul 27, 2012 at 06:11:34AM -0700, Arunmozhi wrote:
>
>
> I feel that the SVN branching and merging/integration algorithm is
> flawed. Ho
On Fri, Jul 27, 2012 at 06:11:34AM -0700, Arunmozhi wrote:
>
>
> I feel that the SVN branching and merging/integration algorithm is
> flawed. However I am not sure if this is a known limitation of SVN. I
> did 2 tests to compare SVN against Perforce/git. The intention of the test
> is to see i
Hi all.
http://twitpic.com/5ctrar/full
There are a picture of my issue!!!
On Fri, Jun 17, 2011 at 2:32 AM, Stefan Sperling wrote:
> On Thu, Jun 16, 2011 at 10:21:49PM -0500, Henry Piñeros wrote:
> > 7. Again, I do a checkout from trunk (C:/Trunk).
> >
> > 8. svn merge *https**://
> example-tes
On Thu, Jun 16, 2011 at 10:21:49PM -0500, Henry Piñeros wrote:
> 7. Again, I do a checkout from trunk (C:/Trunk).
>
> 8. svn merge *https**://example-test-project.googlecode.com/svn/trunk/src/*
> *https**://
> example-test-project.googlecode.com/svn/branches/branchPrueba/src/*
I think you should
This is my case!!!
1. I do a copyTo() from my trunk to a branch (branchPrueba).
2. I do a checkout from branchPrueba (C:/Prueba), I modify a file
(Hola1.java) and after I do commite it.
3. I do a checkout from trunk (C:/Trunk), I modify a file (Hola1.java) and
after I do commite it.
4. Run cm
On 2011-06-16 22:37, Henry Piñeros wrote:
> Can you try it in your computer ? A simple example!!! ( a flder with
> two files)
[...]
Henry,
please tell us _exactly_ what you did; that is, the sequence of
Subversion commands, and their output, if any. Cut and paste from the
command line window. Th
Can you try it in your computer ? A simple example!!! ( a flder with two
files)
On Thu, Jun 16, 2011 at 3:36 PM, Henry Piñeros wrote:
> Thanks Stefan!!.
>
>
> Yes, I do svn revert -R or do a new checkout!!!
>
> The problem is whenI try do a mergen on file level, but if I do it on
> folder lever
Thanks Stefan!!.
Yes, I do svn revert -R or do a new checkout!!!
The problem is whenI try do a mergen on file level, but if I do it on folder
lever(parent folder of that file), It works
:(
On Thu, Jun 16, 2011 at 3:10 PM, Stefan Sperling wrote:
> On Thu, Jun 16, 2011 at 02:27:52PM -050
On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piñeros wrote:
> Hi all.
>
>
> I do a merge between two folders (source) (Ep. svn merge
> http:xxx/src http:xxx/src) and it works very well (It shows a File1.java
> with a conflcit -C)
>
> Whe and I try do it but directly in this file, the merges
11 matches
Mail list logo
