tag a cvs merge point later based on the merging date -

-

the scenario:

i've merged recent version of development branch head couple of weeks ago. know have tag merge-points forgot. head contains couple of features(4-5) haven't been released yet because not tested.

plans have changed, must work on brand new feature. feature must released subset of features head since have not enough time test , release them all.

the question:

i've comitted bunch of things head since merging. possible tag merge-point of head afterwards? if yes, how? know date , time of merge since i've commented first commit after merging.

my plan:

merge desired features head recent branch(the same i've merged head). implement brand new feature, test, release, merge head :)

you can create tags on files given date -d on cvs rtag.

$ cvs rtag -d date {module}

from version management cvs:

-d date tag recent revision no later date.

given situation:

            tag_0     tag_1       tag_2     tag_3 ------------|---------|-----------|---------|--------> trunk     \      \       \----------------------> branch

let's want merge modifications made tag_1 until tag_3 trunk branch. working copy in branch branch, run command:

$ cvs -d -j tag_1 -j tag_3.

-d options creates new directories, if required.


Comments

Post a Comment

Popular posts from this blog

java - Jmockit String final length method mocking Issue -

-
using jmockit 1.2 jar, trying mock string's length method getting unexpected invocation exception: failed: test java.lang.illegalstateexception: missing invocation mocked type @ point; please make sure such invocations appear after declaration of suitable mock field or parameter @ stringdemo.testa$1.<init>(testa.java:17) @ stringdemo.testa.test(testa.java:13) i using testng: @test public void test() throws exception { new expectations() { @mocked("length") string astring; { astring.length(); result = 2; } }; system.out.println(a.showa("test")); } } actual class a: public class { public static int showa(string str){ int a= str.length(); return a; } } this wrong way of recording expected results. shouldn't mock , record string's length() method, record showa() instead. here solution @suppresswarnings("unused&qu
Read more

asp.net - Razor Page Hosted on IIS 6 Fails Every Morning -

-
i have simple page in intranet uses razor/asp fetch single record table , display it, plus few graphic, dashboard display. meaning, no user intervention other first time open ie internal url. the problem having every morning ie displays "page not found or network error" message. refresh page, , it's stuck , doesn't display anything. try different pc, open ie internal url , it's stuck... ...until following: login server hosting page run inetmgr go web sites, etc right click on page that's giving me problem , select browse at moment, error message: server error in '/' application. -------------------------------------------------------------------------------- type of page not served. description: type of page have requested not served because has been explicitly forbidden. extension '.cshtml' may incorrect. please review url below , make sure spelled correctly. requested url: /application/dashboard.cshtml ---------------
Read more

c++ - wxwidget compiling on windows command prompt -

-
can please guide me on method,as how compile wxwidget using windows command prompt or msys. [i can't seem find on wxwiki/wxwidget official book/anywhere else] i have compiled wxwidget instructions have provided (using msys). from searching on internet seems 1 can (maybe?) through use of makefile (is correct?) if yes: directory & how should link wx libraries in makefile if no: way besides makefile? i know can use ide's code::block , make life simpler prefer compile using command prompt/msys. thanks in advance.
Read more