| age |
author |
description |
| 2009-07-14 |
hatton |
Added initial Conflict Diffing/display.conflictWork |
| 2009-07-11 |
hatton |
Some work on syncing... reporting changes of merges is still bogus.conflictWork |
| 2009-07-11 |
hatton |
Make hgrepository read paths/aliases known to hg.conflictWork |
| 2009-07-10 |
hatton |
Fixed reporting of life records marked as deleted, but not actually completely removed.conflictWork |
| 2009-07-10 |
hatton |
Renamed projects; the old "chorus" is now "libchorus". Baton is now "chorus"conflictWork |
| 2009-07-10 |
hatton |
More Chorus UI work.conflictWork |
| 2009-07-09 |
hatton |
More Baton work, representing changes.conflictWork |
| 2009-07-08 |
hatton |
Work on displaying raw changes to lift files, with poor-man's visual diff.conflictWork |
| 2009-07-08 |
hatton |
Renaming of various baton components, part 2conflictWork |
| 2009-07-08 |
hatton |
Renaming of various baton componentsconflictWork |
| 2009-07-08 |
hatton |
Got rid of the Dispatcher, now have a set of ChorusFileTypeHandlers for merging, diffing, and displaying changesconflictWork |
| 2009-07-07 |
hatton |
Factoring out file-type-specfic handlers (e.g. lift) from the lower layers.conflictWork |
| 2009-07-07 |
hatton |
Refactoring DiffingconflictWork |
| 2009-07-07 |
hatton |
Fixed up RevisionChangesView nameconflictWork |
| 2009-07-07 |
hatton |
Early work on diff'ing, currently limitted to LIFT filesconflictWork |
| 2009-07-03 |
hatton |
XmlMerger: Beginnings of reporting on what changed, not just what conflicted.conflictWork |
| 2009-07-03 |
hatton |
Baton UI WorkconflictWork |
| 2009-07-02 |
hatton |
Splitting of winforms-specific code into a "baton" assembly.conflictWork |
| 2009-07-01 |
hatton |
Moved old MainWindow.Designer.csconflictWork |
| 2009-07-01 |
hatton |
Move WinForms-Specific stuff out to its own project, "Baton"conflictWork |
| 2009-07-01 |
hatton |
Introduced "OrderIsRelevant" property to ElementStrategy, made the MergeChildrenMethod sensitive to it. Allow for entries with ids but not guids. Added merge strategies for lift <gloss> and <text>. Added several tests.conflictWork |
| 2009-06-30 |
hatton |
mergeconflictWork |
| 2009-06-30 |
hatton |
checkpointconflictWork |
| 2009-06-04 |
hatton |
Fix WS-1355: clicking history if there's no mercurial gave green box. |
| 2009-04-02 |
hatton |
merge |
| 2009-04-02 |
hatton |
Add HG version to error reporting in case of exceptions |
| 2009-04-02 |
hatton |
For WS-1282: Chorus is using 'hg config', which is deprecated by newer hg. Now uses environment variable "hguser". |
| 2009-04-02 |
hatton |
checkpointconflictWork |
| 2009-02-22 |
hatton |
In the middle of adding context to conflicts so that conflicting document parts can be retrieved in the future. |
| 2009-03-11 |
cambell_prince |
Added additional detail in HgRepository::Execute |
| 2008-11-18 |
hatton |
Remove WrapShellCall. Added test for what happens if we don't have hg installed and try to use it anyways. |
| 2008-10-07 |
John Hatton |
Fixed UTF-16 output bug |
| 2008-10-07 |
John Hatton |
Fixed problem of hg not noticing that the merge failed. |
| 2008-10-01 |
John Hatton |
conflict stuff that was sitting on my machine, un-checked in. |
| 2008-10-01 |
John Hatton |
artwork stuff that's been sitting on my machine for 2 months |
| 2008-10-01 |
John Hatton |
Made work correctly when the project directory name contains a period. |
| 2008-10-01 |
John Hatton |
Made deleted files be removed from tracked files during checkin. |
| 2008-07-28 |
John Hatton |
Added test for scenario where we need to merge independently created conflict files. |
| 2008-07-27 |
John Hatton |
Passing one test for merging conflict files. |
| 2008-07-26 |
John Hatton |
XmlMergeLogEventListener now adds to an existing conflict file, if found. |
| 2008-07-25 |
John Hatton |
Conflict file is created and added to repository. Still needs merging and hopefully we can get it into the same revision as the merge. |
| 2008-07-23 |
John Hatton |
Start of creating actual conflict log files during merging. |
| 2008-07-15 |
John Thomson |
Implemented preserving order of children |
| 2008-07-11 |
John Thomson |
Make buildable with VS 2005 |
| 2008-07-09 |
John Hatton |
Fixed up organization, all tests are green or yellow on my machine. |
| 2008-07-05 |
John Hatton |
Simler usb emulation for tests |
| 2008-07-05 |
John Hatton |
Tests passing |
| 2008-07-05 |
John Hatton |
Reworked user id stuff to come from the OS, and to be stored in the config of the repository. |
| 2008-07-03 |
John Hatton |
Detect whether hg is installed and in PATH |
| 2008-07-02 |
John Hatton |
Minimal history panel working |
| 2008-07-02 |
John Hatton |
Working on getting history |
| 2008-07-02 |
John Hatton |
Starting on HistoryPanel and Model |
| 2008-07-02 |
John Hatton |
Finished conversion to new api |
| 2008-07-02 |
John Hatton |
checkpoint before removing syncmanager |
| 2008-06-30 |
John Hatton |
Checkpoint working on automatically cloning to discovered usb keys |
| 2008-06-30 |
John Hatton |
Reasonalbe set of unit tests for SyncPanelModel |
| 2008-06-30 |
John Hatton |
1st syncPanelModel test |
| 2008-06-28 |
John Hatton |
checkpoint |
| 2008-06-28 |
John Hatton |
Some commenting and renaming after reaquainting myself. |
| 2008-06-28 |
John Hatton |
Initial in from SVN |
