UserFriendly Strip Comments


	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 Michiel	2007-03-04 12:05:23
I need some subversion help (or maybe it's not really subversion I need, but another Linux tool). I've just started using it with a team. Before we started using it, we already had two different (but similar) source trees that inadvertently evolved at the same time. We now need to merge those two trees and start afresh with svn. But I can't figure out how to do it, since they weren't in svn to begin with. I'd just like one resulting source tree with diff-markers in each file. You know: <<<<<< old ... ====== ... >>>>>> new How can I best accomplish this? Thanks!
[ Reply ]
(Grins) I so just read that as	by shadowsystems	2007-03-04 12:17:13
At a guess you probably want	by ToLazyToThink	2007-03-04 12:29:57
That option can't be used to compare directories.	by Michiel	2007-03-04 13:06:57
Well, I don't know subversion so if you	by ToLazyToThink	2007-03-04 13:29:06
Let me put it this way.	by Michiel	2007-03-04 13:40:37
Some diff tools can create these.	by Qcumber-some	2007-03-04 12:34:42
diff is not enough	by Michiel	2007-03-04 13:03:27
You can make SVN do it.	by staticsan	2007-03-04 14:18:47
That's an idea. I'll try it. Thanks. (n/t)	by Michiel	2007-03-04 14:27:39
Didn't quite work as I expected:	by Michiel	2007-03-04 14:42:31
You probalby want to look up svnadmin (n/t)	by CynicalRyan	2007-03-04 15:03:38
I have. But I still don't know what to do.	by Michiel	2007-03-04 15:34:11
False track on my part.	by CynicalRyan	2007-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.)