[Adium-devl] Version control

[Colin Barrett]

On Oct 8, 2007, at 1:22 AM, David Smith wrote:

> I'm fine with both 0 and 1. As for "just the price you have to pay", I
> would definitely be in favor of taking into account all costs relative
> to the current approach, not just those unique to mtn. You'll hear the
> same bitching from me about the other DVCSs if they're brought up :)
> Same goes for the revision number thing.

That is one advantage to hg -- each time a new changeset comes into  
your repository, it gets a local monotonically increasing changeset  
number. Really though, 90% of the time I'm copying things out of a log  
statement anyway, and if there was a notation for the parent of a  
revision (in the nonambiguous case, of course), perhaps ^a83cdef325  
then it would be just as usable.

> These are all a single command in svn except local commit (which  
> doesn't
> exist, of course), but some of them are definitely worse than I would
> like.

> In particular the merge syntax is quite arcane, and my setup for
> 'local branches' is just duplicate checkouts that I cd between when
> needed.  I haven't looked up the mtn equivalents for all of these yet.
>
> "fast path" tasks:
>
> Local Commit of Some Files
> Remote Commit of Some Files
> Update of All Files
> Add File
> Get Diff of Changes
> Get Diff of Changes in a Revision
> Get Log Entry for a Revision
> Get All Log Entries for a File, Directory, or Checkout
> Get List of Changed Files
> Merge Patch to Maintenance Branch

This is two in svn.

svn merge -c rev ../trunk .
svn commit -m "merged [rev]"


> Create Clean Local Copy

This is going to be much faster, and won't require net access (yay!)

> Switch To Patch-In-Progress Local Copy
> <others?>
>
> less frequent tasks:
>
> Create Remote Branch
> Merge Branch Into Trunk
> Local Commit of All Files
> Remote Commit of All Files
> Get Diff of Changes in a Revision Range
> Anything Involving svn blame
> <others>
>
> 					David
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com