Page Comparison

[09:24:54 EDT(-0400)] * agherna (n=argherna@cites-agherna01.ci.uiuc.edu) has joined ##uportal
[09:59:00 EDT(-0400)] * EricDalquist (n=dalquist@bohemia.doit.wisc.edu) has joined ##uportal
[10:00:54 EDT(-0400)] * esm (n=esm@asdf.dkc.jhu.edu) has joined ##uportal
[10:10:47 EDT(-0400)] * colinclark (n=atrcwrk2@142.150.154.101) has joined ##uportal
[10:56:58 EDT(-0400)] <lescour> https://mywebspace.wisc.edu/dalquist/web/gl_tail-0.03.rb
[10:57:21 EDT(-0400)] <lescour> whoops
[10:57:25 EDT(-0400)] <EricDalquist>
[10:57:28 EDT(-0400)] <EricDalquist> that is an old link
[10:57:36 EDT(-0400)] <EricDalquist> just go to web/ and brows to the gl_tail directory
[10:57:40 EDT(-0400)] <lescour> yea...it was sitting the the buffer
[10:57:46 EDT(-0400)] <EricDalquist> ah
[12:06:55 EDT(-0400)] * colinclar1 (n=atrcwrk2@142.150.154.101) has joined ##uportal
[12:29:01 EDT(-0400)] * colinclark (n=atrcwrk2@142.150.154.101) has joined ##uportal
[14:20:33 EDT(-0400)] * clown (n=chatzill@142.150.154.101) has joined ##uportal
[15:02:35 EDT(-0400)] * jayshao (n=jayshao@82.153.125.255) has joined ##uportal
[15:09:13 EDT(-0400)] * jayshao (n=jayshao@82.153.125.255) has joined ##uportal
[15:27:18 EDT(-0400)] <esm> so when an svn merge borks, your working copy may be unhappy and you don't even know it...
[15:27:30 EDT(-0400)] <EricDalquist> oh really
[15:27:33 EDT(-0400)] <EricDalquist> what happened?
[15:27:37 EDT(-0400)] <esm> course i'm using a 1.3.1 client so this may be fixed.
[15:28:33 EDT(-0400)] <esm> so i'm merging the difference between /vendor/branch/v1 and /vendor/branch/v2 to my working copy.
[15:28:43 EDT(-0400)] <esm> i run the merge command and I get the error:
[15:28:54 EDT(-0400)] <esm> svn: URL 'https://bajor.mse.jhu.edu/repos/public/dspace/vendor/dspace-1.4.2/config&#039; doesn't match existing URL 'https://bajor.mse.jhu.edu/repos/public/dspace/trunk/config&#039; in 'config'
[15:29:27 EDT(-0400)] <esm> ok. right. I need to pass the command line arg '--ignore-ancestry'... i just forgot to pass it.
[15:29:46 EDT(-0400)] <esm> so then I can run the merge sucessfully if i add that argument
[15:30:09 EDT(-0400)] <esm> however the previous merge did "stuff" to my working copy before it threw the error, and didn't back out the changes
[15:30:18 EDT(-0400)] <EricDalquist> ah
[15:30:46 EDT(-0400)] <esm> i have files with an 'svn info' like:
[15:31:04 EDT(-0400)] <esm> Path: LICENSE
[15:31:05 EDT(-0400)] <esm> Name: LICENSE
[15:31:05 EDT(-0400)] <esm> URL: https://bajor.mse.jhu.edu/repos/public/dspace/trunk/LICENSE
[15:31:05 EDT(-0400)] <esm> Repository Root: https://bajor.mse.jhu.edu/repos/public
[15:31:05 EDT(-0400)] <esm> Revision: 0
[15:31:05 EDT(-0400)] <esm> Node Kind: file
[15:31:07 EDT(-0400)] <esm> Schedule: replace
[15:31:09 EDT(-0400)] <esm> Copied From URL: https://bajor.mse.jhu.edu/repos/public/dspace/vendor/dspace-1.4.2/LICENSE
[15:31:23 EDT(-0400)] <EricDalquist> uhg
[15:31:38 EDT(-0400)] <esm> a file, in this case LICENSE, is scheduled for replacement when it shouldn't be (because I forgot --ignore-ancestry)
[15:31:57 EDT(-0400)] <esm> but the client didn't revert back the changes when the error cropped up
[15:32:00 EDT(-0400)] <esm> anyway...
[15:32:01 EDT(-0400)] <esm> dang.
[15:32:23 EDT(-0400)] <EricDalquist> svn revert?
[15:32:26 EDT(-0400)] <esm> i can just re do the merge but I'll have to manually resolve the conflicts for a second time.
[15:32:37 EDT(-0400)] <esm> svn revert doesn't fix it.
[15:32:40 EDT(-0400)] <esm> thats the killer
[15:32:49 EDT(-0400)] <EricDalquist> ah
[15:32:50 EDT(-0400)] <esm> svn st, svn revert, etc don't report any modifications to the file
[15:32:50 EDT(-0400)] <EricDalquist> yeah