tfs - Reparenting a child branch to its grand-parent -

-

i have following branch structure:

- main    |- release 1       |- release 1.1    |- release 2

i want reparent release 1.1 main looks like

- main    |- release 1    |- release 1.1    |- release 2

the reason want because many changesets need merged main release 1.1 not release 1

i have been trying baseless merge main release 1.1 using following command:

tf merge /recursive /baseless $/main $/releases/release1.1

it works great, once checked in, can reparent release 1.1 main.

but thing is, command merges main , want create merge relationship. don't want merge main release 1.1 since many other changes other branches have occurred meanwhile.

is there way achieve or future changesets need baseless merged every single time?

to merely create relationship [and not merge everything] need perform baseless selective merge parent potential child branch passing selected changeset numbers. may achieved via gui following below steps mentioned in blogpost: http://roadtoalm.com/2012/09/19/reparent-of-a-source-controlled-branch-why-and-how/

though blog talks reparenting wherein merge changes potential parent branch child branch… there times when do not need changes new parent branch. then? idea go ahead , select changes , merge them child branch , undo pending changes changes not required. once unwanted changes un-done, go ahead , check-in. per blog need set reparent option new parent. know not clean approach works!


Comments

Post a Comment

Popular posts from this blog

java - WrongTypeOfReturnValue exception thrown when unit testing using mockito -

-
my test list<person> mylist; @test public void testisvalidperson() { mylist = new arraylist<person>(); mylist.add(new person("tom")); when(persondao.get(person)).thenreturn(mylist); when((persondao.get(person)).isempty()).thenreturn(false);//------exception thrown boolean result = service.isvalid("tom"); assertfalse(result); } method tested: public boolean isvalid(string person){ persondao = new persondao(); person personobj = new person(person); return (persondao.get(person).isempty())?false : true; } exception thrown: org.mockito.exceptions.misusing.wrongtypeofreturnvalue: boolean cannot returned get() get() should return list *** if you're unsure why you're getting above error read on. due nature of syntax above problem might occur because: 1. exception *might* occur in wrongly written multi-threaded tests. please refer mockito faq on limitations of concurrency testing. 2. sp
Read more

php - Magento - Deleted Base url key -

-
i working on cleaning url: http://mydomain.com/shop/shop/deals i going through settings in configuration tab in admin panel on magento , change secure , unsecure base urls remove first base url "shop" web page read: http://mydomain.com/shop/deals so changed unsecure base urls mydomain.com/shop mydomain.com , secure 12.345.67.89/shop 12.345.67.89. wrong thing do. i cannot reload page or admin console. how access these files through ftp , change correctly there?? when make changes in admin panel changes made in database not in file. have make changes in database. 1.go database , select core_config_data table under table find web/unsecure/base_url , web/secure/base_url . make changes here. don't forget clear cache in var/cache folder
Read more

android - How to disable Button if EditText is empty ? -

-
i have edittext , button in application. when button clicked,the text entered in edittext added listview. i want disable button if edittext empty.how ? this code button click imagebutton imb=(imagebutton)findviewbyid(r.id.btn_send); imb.setonclicklistener(new onclicklistener() { @override public void onclick(view arg0) { edittext et = (edittext)findviewbyid(r.id.edittext1); string str = et.gettext().tostring(); web1.add(str); toast.maketext(shoutsingleprogram.this, "you entered...."+str, toast.length_short).show(); adapter1.notifydatasetchanged(); et.settext(""); } }); } how can ? edittext1.addtextchangedlistener(new textwatcher() { @override public void ontextchanged(charsequence s, int start, int before, in
Read more