New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/ ------------------------------------------------------------ revno: 71 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Matthieu Moy <[EMAIL PROTECTED]> branch nick: moy timestamp: Sat 2006-09-30 09:43:56 +0200 message: Merged my own changes from upstream ;-) modified: docs/DVC-API DVCAPI-20060607202431-452d69f64475172f lisp/bzr-dvc.el bzrdvc.el-20060607202431-20ef9ac8b09edd1c lisp/bzr.el bzr.el-20060607202431-396291df0f2a15ec lisp/dvc-core.el dvccore.el-20060607202432-da72349b546e2115 lisp/dvc-ui.el dvcui.el-20060607202432-7b257b6d7549e970 lisp/dvc-unified.el dvcunified.el-20060607202432-97434bc621edb01e lisp/tla-dvc.el tladvc.el-20060607202432-cccc340800b98535 lisp/tla.el tla.el-20060607202432-cb1c24722bd9074c ------------------------------------------------------------ merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Fri 2006-09-29 21:26:45 +0200 message: Reapplied revno: 66 from Matthieu timestamp: Sat 2006-09-23 02:31:38 +0530 message: Bugfixes. ------------------------------------------------------------ merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Fri 2006-09-29 21:24:49 +0200 message: Reapplied revno: 65 from Matthieu timestamp: Sat 2006-09-23 02:11:44 +0530 message: Document conflict management in docs/DVC-API. Anyone to implement this for other back-ends? ------------------------------------------------------------ merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Fri 2006-09-29 21:23:12 +0200 message: Reapplied revno: 64 from Matthieu timestamp: Sat 2006-09-23 01:56:58 +0530 message: Conflict management now as good in bzr as in tla/baz. ------------------------------------------------------------ merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Fri 2006-09-29 21:20:11 +0200 message: Reapplied revno: 63 from Matthieu timestamp: Sat 2006-09-23 01:27:02 +0530 message: Implemented bzr-resolved. ------------------------------------------------------------ merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Fri 2006-09-29 21:18:52 +0200 message: Reapplied revno: 62 from Matthieu timestamp: Fri 2006-09-22 16:18:45 +0530 message: UI improvements for "commit --local" (prompt, offline/online satus...)
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
