That's one way I thought about working.
Do you do your developments using eric ? if so, when switching between branches do you simply load a different project from file ?
-----Message d'origine-----
De : detlev [mailto:detlev at die-offenbachs.de]
Envoyé : dimanche 6 juin 2010 17:54
À : eric at riverbankcomputing.com
Cc : NARCISO, Rui; Jaime Seuma
Objet : Re: [Eric] Subversion
On Donnerstag, 3. Juni 2010, NARCISO, Rui wrote:
> Hi Jaime
>> Thanks for the reply.
> I completely agree with you and I am in fact currently running my project
> using command line subversion.
>> The basics like exporting and committing to/from repository I've managed to
> do from within Eric. I then went on to create my maintenance branches in
> parallel of my trunk development.
>> What I'm having troubles is using the eric4 svn plugin to switch between
> trunk and maintenance branch efficiently to develop both in parallel ...
> hence my question about a tutorial.
>> As you said, all of the tutorials I managed to find only contain the basic
> stuff which I believe I've gotten the hang of.
>> Rui
>> De : eric-bounces at riverbankcomputing.com
> [mailto:eric-bounces at riverbankcomputing.com] De la part de Jaime Seuma
> Envoyé : jeudi 3 juin 2010 17:40
> À : eric at riverbankcomputing.com
> Objet : Re: [Eric] Subversion
>>> On 3 June 2010 13:00, Narciso, Rui wrote:
>> ------------------------------
>> Message: 6
> Date: Thu, 3 Jun 2010 10:11:57 +0200
> From: "NARCISO, Rui"
> <RUI.NARCISO at airbus.com<mailto:RUI.NARCISO at airbus.com>> To:
> "eric at riverbankcomputing.com<mailto:eric at riverbankcomputing.com>"
> <eric at riverbankcomputing.com<mailto:eric at riverbankcomputing.com>> Subject:
> Re: [Eric] subversion
> Message-ID:
>> <6454_1275552739_4C0763E3_6454_66_1_7B4A1AAF93133E4986F571C4D269C4CF2B5C83
> 893B at DE0-MAILMBX-P13.res.airbus.corp>
>> Content-Type: text/plain; charset="iso-8859-1"
>>> Hi
>> Maybe I wasn't clear.
> I know how to use Eric... I'v been using it for a really long time now.
>> What I was asking for was help on using subversion from within eric.
> Creating branches, efficiently switching between branches; merging and
> resolving conflicts, etc. I've managed to get the basics: commit,
> checkout, diff, but not the advanced stuff ...
>> Cheers
> Rui
>> I'd go for Subversion first, understand the basics, get the hang of it,
> understand the more advanced stuff, get some proficiency with it, and then
> I'd learn how to use any GUI client (the svn eric4 plugin in this case).
> What I mean is that it is maybe good to isolate disciplines here. The use
> of a VCS is -IMHO- a must, but no necessarily for writing code. I use it
> all the time even for documentation. Once you master the subset of
> Subversion that is of most use to you, then you'll be able to use it from
> inside eric4 in not time. That said, in the LogParser tutorial I explain
> some basic stuff, included the use of the Svn plugin. But of course I
> didn't want to get into merging, branches and the like. This is Svn stuff,
> not eric4 stuff.
>> HIH
>> Jaime
>> This mail has originated outside your organization, either from an external
> partner or the Global Internet.
>> Keep this in mind if you answer this message.
>>>> The information in this e-mail is confidential. The contents may not be
> disclosed or used by anyone other than the addressee. Access to this
> e-mail by anyone else is unauthorised. If you are not the intended
> recipient, please notify Airbus immediately and delete this e-mail. Airbus
> cannot accept any responsibility for the accuracy or completeness of this
> e-mail as it has been sent over public networks. If you have any concerns
> over the content of this message or its Accuracy or Integrity, please
> contact Airbus immediately. All outgoing e-mails from Airbus are checked
> using regularly updated virus scanning software but you should take
> whatever measures you deem to be appropriate to ensure that this message
> and any attachments are virus free.
>
For eric development I create a branch for a stable release and keep a local
working copy of this branch. Development of trunk is done in a separate
working copy. This way I don't have to switch back and forth between the
branches. If this is the best way to work with subversion can be questioned.
However, it works for me.
Regards,
Detlev
--
Detlev Offenbach
detlev at die-offenbachs.de
This mail has originated outside your organization, either from an external partner or the Global Internet.
Keep this in mind if you answer this message.
The information in this e-mail is confidential. The contents may not be disclosed or used by anyone other than the addressee. Access to this e-mail by anyone else is unauthorised.
If you are not the intended recipient, please notify Airbus immediately and delete this e-mail.
Airbus cannot accept any responsibility for the accuracy or completeness of this e-mail as it has been sent over public networks. If you have any concerns over the content of this message or its Accuracy or Integrity, please contact Airbus immediately.
All outgoing e-mails from Airbus are checked using regularly updated virus scanning software but you should take whatever measures you deem to be appropriate to ensure that this message and any attachments are virus free.
More information about the Eric
mailing list
‘She has never mentioned her father to me. Was he—well, the sort of man whom the County Club would not have blackballed?’ "We walked by the side of our teams or behind the wagons, we slept on the ground at night, we did our own cooking, we washed our knives by sticking them into the ground rapidly a few times, and we washed our plates with sand and wisps of grass. When we stopped, we arranged our wagons in a circle, and thus formed a 'corral,' or yard, where we drove our oxen to yoke them up. And the corral was often very useful as a fort, or camp, for defending ourselves against the Indians. Do you see that little hollow down there?" he asked, pointing to a depression in the ground a short distance to the right of the train. "Well, in that hollow our wagon-train was kept three days and nights by the Indians. Three days and nights they stayed around, and made several attacks. Two of our men were killed and three were wounded by their arrows, and others had narrow escapes. One arrow hit me on the throat, but I was saved by the knot of my neckerchief, and the point only tore the skin a little. Since that time I have always had a fondness for large neckties. I don't know how many of the Indians we killed, as they carried off their dead and wounded, to save them from being scalped. Next to getting the scalps of their enemies, the most important thing with the Indians is to save their own. We had several fights during our journey, but that one was the worst. Once a little party of us were surrounded in a small 'wallow,' and had a tough time to defend ourselves successfully. Luckily for us, the Indians had no fire-arms then, and their bows and arrows were no match for our rifles. Nowadays they are well armed, but there are[Pg 41] not so many of them, and they are not inclined to trouble the railway trains. They used to do a great deal of mischief in the old times, and many a poor fellow has been killed by them." As dusk came on nearly the whole population of Maastricht, with all their temporary guests, formed an endless procession and went to invoke God's mercy by the Virgin Mary's intercession. They went to Our Lady's Church, in which stands the miraculous statue of Sancta Maria Stella Maris. The procession filled all the principal streets and squares of the town. I took my stand at the corner of the Vrijthof, where all marched past me, men, women, and children, all praying aloud, with loud voices beseeching: "Our Lady, Star of the Sea, pray for us ... pray for us ... pray for us ...!" It had not occurred to her for some hours after Mrs. Campbell had told her of Landor's death that she was free now to give herself to Cairness. She had gasped, indeed, when she did remember it, and had put the thought away, angrily and self-reproachfully. But it returned now, and she felt that she might cling to it. She had been grateful, and she had been faithful, too.[Pg 286] She remembered only that Landor had been kind to her, and forgot that for the last two years she had borne with much harsh coldness, and with a sort of contempt which she felt in her unanalyzing mind to have been entirely unmerited. Gradually she raised herself until she sat quite erect by the side of the mound, the old exultation of her half-wild girlhood shining in her face as she planned the future, which only a few minutes before had seemed so hopeless. After he had gloated over Sergeant Ramsey, Shorty got his men into the road ready to start. Si placed himself in front of the squad and deliberately loaded his musket in their sight. Shorty took his place in the rear, and gave out: The groups about each gun thinned out, as the shrieking fragments of shell mowed down man after man, but the rapidity of the fire did not slacken in the least. One of the Lieutenants turned and motioned with his saber to the riders seated on their horses in the line of limbers under the cover of the slope. One rider sprang from each team and ran up to take the place of men who had fallen. "As long as there's men and women in the world, the men 'ull be top and the women bottom." Then, in the house, the little girls were useful. Mrs. Backfield was not so energetic as she used to be. She had never been a robust woman, and though her husband's care had kept her well and strong, her frame was not equal to Reuben's demands; after fourteen years' hard labour, she suffered from rheumatism, which though seldom acute, was inclined to make her stiff and slow. It was here that Caro and Tilly came in, and Reuben began to appreciate his girls. After all, girls were needed in a house—and as for young men and marriage, their father could easily see that such follies did not spoil their usefulness or take them from him. Caro and Tilly helped their grandmother in all sorts of ways—they dusted, they watched pots, they shelled peas and peeled potatoes, they darned house-linen, they could even make a bed between them. HoME一级毛片视频免费公开
ENTER NUMBET 0018www.dtmis.com.cn cijianlai.com.cn wulianhua.com.cn www.evecsa.com.cn henssi.com.cn www.elify.com.cn wishr.com.cn www.ivmu.com.cn www.enyier.com.cn www.xjqn.com.cn