Wherever I can I have switched to git. When switching branches (a common thing with git), git replaces files 'in place'.
That has some side effects with TM:
- when I switch branches (say from the stable to the development branch) and forget to close the project window first, TM happily overwrites the project file. Thus I loose all the changes (eg new classes added etc). Ideally TM should recognize that the project file changed and reload it.
- Transitory information: TM seems to store transitory information (window position or some such) in the project file, thus dirtying my project. I'd prefer that TM would write that kind of info into a separate file, so I can chose to track it or not.
How about some TM2 teasers?
Thanks
Gerd
On May 20, 2009, at 12:25 PM, Gerd Knops wrote:
- Transitory information: TM seems to store transitory information
(window position or some such) in the project file, thus dirtying my project. I'd prefer that TM would write that kind of info into a separate file, so I can chose to track it or not.
Oh, yes please! Even better if this could be stored in ~/Application Support or something. We run into "project file bumps" quite a lot when there is more than one person working on the same project. We want to track the TM project file because we organize the files in groups, etc. and want that to be common across the board. But I don't need to track which tabs my boss had open last.
------------------------------------- Dana Kashubeck Systems Manager Riemer Reporting Service Inc. http://www.riemer.com
Phone: 440-835-2477 x. 125 Fax: 440-835-4594 -------------------------------------
On Thu, May 21, 2009 at 10:26 AM, Dana Kashubeck dana.kashubeck@riemer.com wrote:
On May 20, 2009, at 12:25 PM, Gerd Knops wrote:
- Transitory information: TM seems to store transitory information
(window position or some such) in the project file, thus dirtying my project. I'd prefer that TM would write that kind of info into a separate file, so I can chose to track it or not.
Oh, yes please! Even better if this could be stored in ~/Application Support or something. We run into "project file bumps" quite a lot when there is more than one person working on the same project. We want to track the TM project file because we organize the files in groups, etc. and want that to be common across the board. But I don't need to track which tabs my boss had open last.
Can't this be handled by .gitignore?
What is the name of the file/files anyway. I just looked at several project directories which I use with textmate both with and without explicit textmate projects, and I can't find anything
On May 21, 2009, at 7:55 AM, Rick DeNatale wrote:
Can't this be handled by .gitignore?
No, the whole point is that the .tmproj file contains user-independent information (groups, folders, ignores, etc.) and user-dependent information (tab layout, current document, etc.). We want to be able to commit the user-independent info, without bringing the user- dependent info along for the ride. It also affects more than just git users.
On 20 May 2009, at 18:25, Gerd Knops wrote:
Wherever I can I have switched to git. When switching branches (a common thing with git), git replaces files 'in place'.
That has some side effects with TM:
- when I switch branches (say from the stable to the development
branch) and forget to close the project window first, TM happily overwrites the project file. Thus I loose all the changes (eg new classes added etc). Ideally TM should recognize that the project file changed and reload it.
- Transitory information: TM seems to store transitory information
(window position or some such) in the project file, thus dirtying my project. I'd prefer that TM would write that kind of info into a separate file, so I can chose to track it or not.
How about some TM2 teasers?
As mentioned before, there are no project files, it is instead using a “real” file browser and per folder property files where you can set variables and similar for that folder (and those below it).
Also, it offers 3-way merge when files on disk change which also have local (unsaved) changes :)
On Jun 2, 2009, at 12:28 AM, Allan Odgaard wrote:
As mentioned before, there are no project files, it is instead using a “real” file browser and per folder property files where you can set variables and similar for that folder (and those below it).
Also, it offers 3-way merge when files on disk change which also have local (unsaved) changes :)
Outstanding, can't wait! Thanks Allan.
Also, it offers 3-way merge when files on disk change which also have local (unsaved) changes :)
If this is true, 3-way merge will be a KILLER FEATURE of TM2. I have already Changes which does the job well, coz I couldn't stand retarded FileMerge UI. But Changes now has been sold to some other company, and well I don't know what's gonna happen with this nice tool, which's its price already bumped up.
Regards,
On 15 Jun 2009, at 17:41, Adam Strzelecki wrote:
Also, it offers 3-way merge when files on disk change which also have local (unsaved) changes :)
If this is true, 3-way merge will be a KILLER FEATURE of TM2 [...]
This is why I shouldn’t talk about 2.0 stuff — taken out of context, I see how this can be interpreted, but no, TM 2 does NOT have any UI for file merging.
What I was referring to is the situation where a file has local unsaved changes but is then also changed on disk, which can happen if you switch branch. 1.x then allows you to keep local version (old file) or reload file (new file, losing changes), 2.0 will do a 3-way merge, i.e. apply your local changes to the new version of the file on disk.
What I was referring to is the situation where a file has local unsaved changes but is then also changed on disk, which can happen if you switch branch. 1.x then allows you to keep local version (old file) or reload file (new file, losing changes), 2.0 will do a 3-way merge, i.e. apply your local changes to the new version of the file on disk.
Clear, still it is pretty cool feature you describe. But then I hope you will integrate with "diff" compatible tools in case auto-merge fails?
Regards,
-
Adam Strzelecki -
Allan Odgaard -
Dana Kashubeck -
Dave Carrigan -
Gerd Knops -
Rick DeNatale