Issue with merge
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 doesn't work (Ep. svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't show the conflict, it show -U File1.java!! Help me!! Sorry for my englsih -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
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 -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 doesn't work > (Ep. > > svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't > > show the conflict, it show -U File1.java!! > > Hmmm, your problem description is lacking a lot of detail :( > I will try to help you anyway: > > Did you run "svn revert -R ." on your working copy before repeating > the merge? If you did not, then merge tracking might prevent changes > from being merged into the file because the file already has them. > All you will end up with in this case is probably a mergeinfo change. > > If your working copy has no local changes (svn diff output is empty) > and you don't get any changes merged into your working copy, > try this command: > > svn diff http:xxx/src/File1.java http:xxx/src/File1.java > > and you will probably see that your merge has an *empty* diff. > So there is nothing to merge, and no conflict. > The only thing it changes is probably mergeinfo. > > You probably want something like this instead: > > cd src/ > svn merge -c 42 http:xxx/src/File1.java File1.java > > or this: > > cd src/ > svn merge http:xxx/src/File1.java@42 http:xxx/src/file1.j...@43file1.java > > or this (to merge all outstanding changes): > > cd src/ > svn merge http:xxx/src/File1.java File1.java > > See also: > > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax > > And this: > > http://mail-archives.apache.org/mod_mbox/subversion-users/201103.mbox/%3c20110308203505.gb19...@jack.stsp.name%3E > -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
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(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 -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 doesn't work >> (Ep. >> > svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't >> > show the conflict, it show -U File1.java!! >> >> Hmmm, your problem description is lacking a lot of detail :( >> I will try to help you anyway: >> >> Did you run "svn revert -R ." on your working copy before repeating >> the merge? If you did not, then merge tracking might prevent changes >> from being merged into the file because the file already has them. >> All you will end up with in this case is probably a mergeinfo change. >> >> If your working copy has no local changes (svn diff output is empty) >> and you don't get any changes merged into your working copy, >> try this command: >> >> svn diff http:xxx/src/File1.java http:xxx/src/File1.java >> >> and you will probably see that your merge has an *empty* diff. >> So there is nothing to merge, and no conflict. >> The only thing it changes is probably mergeinfo. >> >> You probably want something like this instead: >> >> cd src/ >> svn merge -c 42 http:xxx/src/File1.java File1.java >> >> or this: >> >> cd src/ >> svn merge http:xxx/src/File1.java@42 http:xxx/src/file1.j...@43file1.java >> >> or this (to merge all outstanding changes): >> >> cd src/ >> svn merge http:xxx/src/File1.java File1.java >> >> See also: >> >> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax >> >> And this: >> >> http://mail-archives.apache.org/mod_mbox/subversion-users/201103.mbox/%3c20110308203505.gb19...@jack.stsp.name%3E >> > > > > -- > Estudiante de Ingenieria de Sistemas e Informatica > Univesidad Nacional de Colombia > Sede Medellin > 2011 > > > > -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
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 cmd, then… cd C:/Trunk/src 5. svn merge *https**:// example-test-project.googlecode.com/svn/trunk/src/Hola1.java* *https**:// example-test-project.googlecode.com/svn/branches/branchPrueba/src/Hola1.java * --Merge difference… U Hola1.java 6. I drop C:/Trunk (I didn’t commit it). 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/* C Hola1.java … Shows a message to resolve conflict between fonts Tomorrow, I going to post here!! (with images) Thank before hands ... I forget this!! I do merge between the files .java with tortoise which work very well.. It show the copnflict 2011/6/16 Michael Diers > 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. Then indicate where and when Subversion didn't work > as you expected, and why you think it is not working right. > > By doing that, you very much increase the chances of getting the answer > you are looking for. Also, if people agree that there is a problem, you > actually contributed a test case for the Subversion test suite! > > Thanks. > > -- > Michael Diers, elego Software Solutions GmbH, http://www.elego.de > > -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
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-test-project.googlecode.com/svn/trunk/src/* > > *https**:// > > example-test-project.googlecode.com/svn/branches/branchPrueba/src/* > > I think you should try to use this syntax instead: > > cd c:\trunk > svn merge --reintegrate > https://example-test-project.googlecode.com/svn/branches/branchPrueba/ > > > C Hola1.java > > > > … Shows a message to resolve conflict between fonts > > > > > > Tomorrow, I going to post here!! (with images) > > > > No, please do not post images to this list. > You may link to them if you have them somewhere on the web, but please > do not attach them. Mail you send to this list goes to a huge number > of mail boxes so please try to use only text to keep the messages small. > Thanks! > -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
