Changes between Version 33 and Version 34 of DarcsEvaluation


Ignore:
Timestamp:
Jul 24, 2008 2:47:18 PM (7 years ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v33 v34  
    313313||{{{darcs record -a -m foo}}}||{{{git commit -a -m foo}}}|| 
    314314||{{{darcs pull}}}||{{{git pull}}} then {{{git cherry-pick}}}/{{{gitk}}} + select patches using mouse.  It's probably best to have one local branch correspond to the remote branch and then cherry-pick from that.  You can also create local names for several remote repositories.|| 
     315 
     316=== File renames === 
    315317 
    316318Git doesn't handle file renames well.  Here's a script to demonstrate the problem: 
     
    388390# abort: Fix up the merge and run hg transplant --continue 
    389391}}} 
     392 
     393bzr manages this example without any difficulty: 
     394 
     395{{{ 
     396#!/bin/sh 
     397 
     398rm -rf repo1 repo2 
     399 
     400mkdir repo1 
     401cd repo1 
     402bzr init 
     403printf "b\nd\n" >file 
     404bzr add file 
     405bzr status 
     406bzr commit -m "bd" 
     407 
     408cd .. 
     409bzr checkout repo1 repo2 
     410   
     411cd repo1 
     412bzr mv file file1 
     413bzr commit -m move 
     414printf "a\nb\nd\ne\n" >file1 
     415bzr commit -m "abde" file1  
     416printf "a\nb\nc\nd\ne\n" >file1 
     417bzr commit -m "abcde" file1 
     418   
     419cd ../repo2 
     420bzr merge -c 4 ../repo1 
     421# cherry-picks revision 4 from repo1 
     422bzr diff 
     423}}} 
     424 
     425and, of course, darcs has no difficulty either. 
    390426 
    391427== Darcs alternatives still in the running ==