[Fix] Edge case of GIT-VS-VERSION-GEN failure.
Reported by Thell Fowler | October 29th, 2010 @ 08:48 PM | in v2.0.0
During rare instances the version generator can fail even though a build would have succeeded. This can happen when a merge was being done that resulted in conflicts, but those conflicts are resolved by a mergetool automatically leaving the previously conflicted file in an 'Unmerged' state.
Add error message output to the version generator script stating that the working tree is not prepared for build testing, and allow for the --force option to start the build anyway.
Comments and changes to this ticket
-
Thell Fowler October 29th, 2010 @ 09:31 PM
- State changed from “new” to “open”
Example script error output:
1>------ Rebuild All started: Project: notepadPlus, Configuration: Release Win32 ------
1>Deleting intermediate and output files for project 'notepadPlus', configuration 'Release|Win32'
1>Runtime build and version generation.
1>>>The working tree index is not prepared for build testing!
1>>>Please check git status or use --force to ignore the index state.
1>Project : error PRJ0019: A tool returned an error code from "Runtime build and version generation."
1>Build Time 0:02
1>Build log was saved at "file://c:\Users\almostautomated\datastore\repos\git\npp-community-setup\PowerEditor\visual.net\Release\BuildLog.htm"
1>notepadPlus - 1 error(s), 0 warning(s)
========== Rebuild All: 0 succeeded, 1 failed, 0 skipped ==========Adding --force to the calling command results in successful version generation.
-
Thell Fowler October 29th, 2010 @ 09:51 PM
(from [7f5d7630dfc02fa377064cad2b84cbdd42e02f45]) GIT-VS-VERSION-GEN: handle unmerged files index
- Make unmerged files in index issue an informative message and allow the --force flag to ignore the working tree state and cause the VS build to run anyway.
[#48]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/almostautomated/npp-community/commit/7f5d7630dfc0... -
Thell Fowler October 29th, 2010 @ 09:56 PM
- Milestone set to “v2.0.0”
-
Thell Fowler October 29th, 2010 @ 11:17 PM
- State changed from “open” to “needs_ack”
-
Jocelyn Legault October 29th, 2010 @ 11:18 PM
- State changed from “needs_ack” to “acked”
-
Thell Fowler October 31st, 2010 @ 08:11 PM
(from [513282a3b3307456d6e6f39957c58972bb630aba]) Project Files: remove cache file on project clean
- When vcbuild cleans the project the cache file should also be removed.
[#48]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/npp-community/npp-community/commit/513282a3b33074... -
Thell Fowler October 31st, 2010 @ 08:13 PM
- State changed from “acked” to “resolved”
- Assigned user cleared.
This trivial patch was fast-tracked into master.
Please Sign in or create a free account to add a new ticket.
With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Notepad++ Community Release
Jocelyn Legault
npp-community
