The Daily Static
  The Daily Static
UF Archives
Register
UF Membership
Ad Free Site
Postcards
Community

Geekfinder
UFie Gear
Advertise on UF

Forum Rules
& FAQ


Username

Password


Create a New Account

 
 

Back to UserFriendly Strip Comments Index

Invoke: Subversion UFies by Michiel2007-03-04 12:05:23
  You can make SVN do it. by staticsan2007-03-04 14:18:47
    That's an idea. I'll try it. Thanks. (n/t) by Michiel2007-03-04 14:27:39
      Didn't quite work as I expected: by Michiel 2007-03-04 14:42:31
I created two source-trees in the repository under $SVNROOT/source1 and $SVNROOT/source2. Then I used the following command:

svn merge $SVNROOT/source1 $SVNROOT/source2 .

To merge them into the current working directory. But for each file I get the following:

Skipped 'filename'
A filename

And the result is that I get all unmerged files form source 2.

What am I doing wrong?

Thanks!
[ Reply ]
        You probalby want to look up svnadmin (n/t) by CynicalRyan2007-03-04 15:03:38
          I have. But I still don't know what to do. by Michiel2007-03-04 15:34:11
            False track on my part. by CynicalRyan2007-03-04 15:39:29

 

[Todays Cartoon Discussion] [News Index]

Come get yer ARS (Account Registration System) Source Code here!
All images, characters, content and text are copyrighted and trademarks of J.D. Frazer except where other ownership applies. Don't do bad things, we have lawyers.
UserFriendly.Org and its operators are not liable for comments or content posted by its visitors, and will cheerfully assist the lawful authorities in hunting down script-kiddies, spammers and other net scum. And if you're really bad, we'll call your mom. (We're not kidding, we've done it before.)