headers
Stephen Leake | 3 Oct 14:59
Favicon

rev 540: xmtn conflicts, propagate improvements

Committed revision 540 to http://stephe-leake.org/dvc

xmtn conflicts, propagate improvements

  * lisp/dvc-diff.el (dvc-dvc-file-diff): use correct dvc

  * lisp/dvc-status.el (dvc-status-dtrt): do ediff on renames; same as modified.

  * lisp/xmtn-automate.el (xmtn-automate-terminate-processes-in-root):
    improve tracing of session caching.

  * lisp/xmtn-base.el (xmtn--filter-non-dir): new

  * lisp/xmtn-conflicts.el (xmtn-conflicts-write-header): don't write out
    ancestor id if there isn't one.
    (xmtn-conflicts-resolve-user): add default-side
    (xmtn-conflicts-resolve-map): use it
    (xmtn-conflicts-do-propagate): allow caching the branch
    (xmtn-conflicts-mode-menu): add xmtn-conflicts-ediff-resolution-ws
    (xmtn-conflicts-save-opts): allow caching branches.
    (xmtn-conflicts-1): don't need xmtn-dvc-log-clean
    (xmtn-check-workspace-for-propagate): allow caching branch
    (xmtn-conflicts-propagate): cache branches
    (xmtn-conflicts-clean): add message.

  * lisp/xmtn-dvc.el: delete xmtn-dvc-log-clean
    (xmtn--do-update): add post-update-p; allow calling update from a
    higher level
    (xmtn--update): add check-id-p, no-ding; allow calling update from a
    higher level
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Leake | 3 Oct 14:59
Favicon

rev 541: previous commit didn't save buffers

Committed revision 541 to http://stephe-leake.org/dvc

previous commit didn't save buffers

  * lisp/xmtn-conflicts.el: clean up comments

  * lisp/xmtn-dvc.el: clean up comments

--

-- 
-- Stephe
Permalink | Reply | 0 comments |
headers
Stefan Reichör | 10 Oct 08:39
Picon

[commit] rev 566: Merged from Stephen Leake: Improved xmtn conflict handling

Committed revision 566 to http://bzr.xsteve.at/dvc/

Merged from Stephen Leake: Improved xmtn conflict handling
Permalink | Reply | 0 comments |
headers
Manoj Srivastava | 14 Oct 17:16
X-Face
Face
Picon

git mirror for dvc?

Hi,

        I was wondering if there is a git mirror for dvc? I am starting
 to experiment with dvc, but am not yet comfortable using dvc to follow
 dvc itself, and I don't know bzr well enough to not get into trouble
 using that.  A git mirror would be immensly helpful.

        manoj
--

-- 
May your SO always know when you need a hug.
Manoj Srivastava <srivasta <at> acm.org> <http://www.golden-gryphon.com/>  
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C
Permalink | Reply | 0 comments |
headers
Alexey Kopytov | 28 Oct 16:26
Picon
Gravatar

[Bug 386779] Re: make fails on OS X at "date" call

** Description changed:

  Symptom:

  On OS X, when running 'make' in /path/to/dvc/++build/ as per
  instructions (that is, after running 'autoconf' and 'configure'), exits
  abruptly with an error message citing unexpected 'date' behavior. (Sorry
  not to have copied it, should be deterministically easy to reproduce).
- 

  Workaround:

  1. Install gdate (typically by installing the GNU 'coreutils' package via MacPorts/Fink).
  2. Symlink 'gdate' as 'date' in some path directory which appears earlier in $PATH than /bin/date.

  DVC's 'make' then runs to successful completion on both 10.4.11 on Intel
  and 10.5.6 on PPC, so probably works on all OS X.

- 
  Fix:

  Test for GNU 'date' in 'configure' and abort if not (or find a way to
  make the build script work with OS X 'date').

- 
  Analysis:

  It seems likely that this defect will occur on other BSD derivatives
  (though I have no data to submit).
(Continue reading)

Permalink | Reply | 0 comments |

Gmane